Merge https://github.com/blissroms/blissroms.github.io
diff --git a/css/style.css b/css/style.css
index 4d9fe13..8b86c86 100644
--- a/css/style.css
+++ b/css/style.css
@@ -19,6 +19,7 @@
float: left !important; }
.container {width: 768px}
.navbar-right {margin-right: 0;}
+ .navbar>.container .navbar-brand, .navbar>.container-fluid .navbar-brand {margin-left: 0;padding-left: 15px}
}
@media (min-width: 992px) {
.pull-right-md {
@@ -34,9 +35,11 @@
float: left !important; }
.container {width: 1170px;}
.portfolio-projects .col-lg-6 {width: 100%}
+ .navbar > .container {max-width: 1170px}
}
@media (min-width: 1366px) {
#portfolio > .container, #about > .row {width: 90%;max-width: 1600px;margin-left:auto;margin-right: auto;}
+ .navbar > .container {max-width: 1170px}
}
* {
box-sizing: border-box; }
@@ -118,10 +121,10 @@
border-radius: 0;
-webkit-transition: background-color .2s ease 0s;
transition: background-color .2s ease 0s; }
-.navbar > .container {padding: 4px 0 0 0;width: 100%}
+.navbar > .container {padding: 4px 0 0 0;width: 100%;margin-top:2px;}
.navbar-brand {
opacity: 0;
- margin-top: 7px;
+ margin-top: 5px;
padding: 15px 0;
color: #ffffff;
font-weight: 400; }
@@ -131,7 +134,7 @@
font-weight: 500;
font-size: 1em;
text-transform: lowercase;
- margin: 9px 5px 5px 5px;
+ margin: 3px 5px;
border: 1px solid transparent;
border-radius: 5px;
-webkit-transition: color .2s ease 0s, border-color .2s ease 0s;