Update to navigation

weblab · Jun 26, 2015 · 258846d · 258846d
1 parent a0f2f69
commit 258846d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/css/ece.css b/css/ece.css
@@ -8873,6 +8873,7 @@ h1, .h1, h2, .h2, h3, .h3 {
 }
 #site-title #uc-site-title {
   width: 400px;
+  padding-bottom: 15px;
 }
 @media (max-width: 1200px) {
   #site-title #uc-site-title {
@@ -8893,16 +8894,16 @@ h1, .h1, h2, .h2, h3, .h3 {
     width: auto;
   }
 }
+#site-title #site-navigation #primary-nav {
+  padding-left: 0px;
+}
 #site-title #site-navigation #primary-nav #menu-primary li:nth-last-child(1) a:before {
   content: "\E028";
   font-family: "Glyphicons Regular";
   padding-right: 8px;
   vertical-align: sub;
 }
 
-#nav-wrapper {
-  margin-top: 16px;
-}
 @media (max-width: 767px) {
   #nav-wrapper {
     margin-top: 0;
@@ -8922,25 +8923,27 @@ h1, .h1, h2, .h2, h3, .h3 {
   display: none;
 }
 #nav-wrapper .navbar {
-  margin-bottom: 16px;
+  margin-bottom: 10px;
 }
 @media (max-width: 767px) {
   #nav-wrapper .navbar {
     margin-bottom: 0;
   }
 }
-#nav-wrapper .navbar-nav {
-  float: right;
-}
 @media (max-width: 767px) {
   #nav-wrapper .navbar-nav {
     float: none;
     text-align: center;
   }
 }
-@media (max-width: 1200px) {
+#nav-wrapper .navbar-nav li a {
+  padding-left: 0px;
+  padding-right: 30px;
+  padding-bottom: 0;
+}
+@media (max-width: 767px) {
   #nav-wrapper .navbar-nav li a {
-    padding-left: 10px;
+    padding-bottom: 10px;
   }
 }
 #nav-wrapper ul li a {

diff --git a/header.php b/header.php
@@ -41,12 +41,10 @@ if (/*@cc_on!@*/false) {
 			<div class="container">
 				<?php include 'inc/header-img.php'; ?>
 				<div class="row">
-					<div class="col-sm-3">
+					<div class="col-sm-12">
 						<div class="site-branding hidden-xs" id="uc-site-header">
 							<?php include 'inc/site-title.php'; ?>
 						</div>
-					</div>
-					<div class="col-sm-9">
 						<div id="nav-wrapper">
                             <?php include 'inc/nav.php'; ?>
                         </div>

diff --git a/sass/ece.scss b/sass/ece.scss
@@ -59,6 +59,7 @@ h1, .h1, h2, .h2, h3, .h3 {
 
 	#uc-site-title {
 		width:400px;
+		padding-bottom:15px;
 
 		@media (max-width:1200px) {
 			 line-height: 1.5em;
@@ -77,6 +78,7 @@ h1, .h1, h2, .h2, h3, .h3 {
 
 	#site-navigation {
 		#primary-nav {
+			padding-left: 0px;
 			#menu-primary {
 				li:nth-last-child(1) {
 					a:before {
@@ -92,7 +94,6 @@ h1, .h1, h2, .h2, h3, .h3 {
 }
 
 #nav-wrapper {
-	margin-top:16px;
 
 	@media (max-width:767px) {
 			margin-top:0;
@@ -117,15 +118,14 @@ h1, .h1, h2, .h2, h3, .h3 {
 
 	}
 	.navbar {
-		margin-bottom:16px;
+		margin-bottom:10px;
 
 		@media (max-width:767px) {
 			margin-bottom:0;
 		}
 	}
 
 	.navbar-nav {
-		float:right;
 
 		@media (max-width:767px) {
 			float:none;
@@ -135,8 +135,12 @@ h1, .h1, h2, .h2, h3, .h3 {
 
 		li {
 			a {
-				@media (max-width:1200px) {
-					padding-left:10px;
+				padding-left:0px;
+				padding-right:30px;
+				padding-bottom:0;
+
+				@media (max-width:767px) {
+					padding-bottom:10px;
 				}
 			}
 		}