fixes thomaspark#69, subnav-fixed position tweaks

howdous · Feb 9, 2013 · 078ff71 · 078ff71
1 parent c889a18
commit 078ff71
Show file tree

Hide file tree

Showing 33 changed files with 118 additions and 136 deletions.
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
@@ -5241,20 +5241,16 @@ hr {
   }
 }
 div.subnav {
-  background-color: rgba(42, 99, 105, 0.9);
-  background-image: none;
-  border: 0px solid transparent;
+  margin: 0 1px;
+  background: rgba(42, 99, 105, 0.9) none;
+  border: none;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
 }
-div.subnav .nav > li.open > a {
-  border-color: transparent;
-  background-color: rgba(255, 255, 255, 0.4);
-}
 div.subnav .nav > li > a {
   color: rgba(255, 255, 255, 0.9);
   border-color: transparent;
@@ -5266,27 +5262,26 @@ div.subnav .nav > li:first-child > a:hover {
   border-radius: 0;
 }
 div.subnav .nav > .active > a {
-  background-color: transparent;
+  background-color: rgba(255, 255, 255, 0.4);
   border-color: transparent;
   color: rgba(255, 255, 255, 0.9);
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
 }
-div.subnav .nav > .active > a:hover,
 div.subnav .nav > li > a:hover,
-div.subnav .nav > .active > a,
 div.subnav .nav > .active > a:hover {
   border-right-color: transparent;
   background-color: rgba(255, 255, 255, 0.4);
   color: rgba(255, 255, 255, 0.9);
 }
-div.subnav .nav > li:first-child > a:hover {
-  border-left-color: rgba(255, 255, 255, 0.4);
-  border-left-width: 1px;
+div.subnav .nav > li.open > a {
+  border-color: transparent;
+  background-color: rgba(255, 255, 255, 0.4);
 }
 div.subnav-fixed {
-  top: 50px;
+  top: 51px;
+  margin: 0;
 }
 .nav-tabs li.open > .dropdown-toggle,
 .nav-pills li.open > .dropdown-toggle {

diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css
diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
@@ -160,17 +160,12 @@ hr {
 
 div.subnav {
 
-	background-color: rgba(42, 99, 105, 0.9);
-	background-image: none;
-	border: 0px solid transparent;
+	margin: 0 1px;
+	background: rgba(42, 99, 105, 0.9) none;
+	border: none;
 	.border-radius(0);
 	.box-shadow(none);
 
-	.nav > li.open > a {
-		border-color: transparent;
-		background-color: rgba(255, 255, 255, 0.4);
-	}
-
 	.nav > li > a {
 		color: @textColor;
 		border-color: transparent;
@@ -182,28 +177,27 @@ div.subnav {
 	}
 
 	.nav > .active > a {
-		background-color: transparent;
+		background-color: rgba(255, 255, 255, 0.4);
 		border-color: transparent;
 		color: @textColor;
 		.box-shadow(none);
 	}
 
-	.nav > .active > a:hover,
 	.nav > li > a:hover,
-	.nav > .active > a,
 	.nav > .active > a:hover, {
 		border-right-color: transparent;
 		background-color: rgba(255, 255, 255, 0.4);
 		color: @textColor;
 	}
 
-	.nav > li:first-child > a:hover {
-		border-left-color: rgba(255, 255, 255, 0.4);
-		border-left-width: 1px;
+	.nav > li.open > a {
+		border-color: transparent;
+		background-color: rgba(255, 255, 255, 0.4);
 	}
 
 	&-fixed {
-		top: 50px;
+		top: @navbarHeight + 1;
+		margin: 0;
 	}
 }
 

diff --git a/cerulean/bootstrap.css b/cerulean/bootstrap.css
@@ -5187,7 +5187,7 @@ div.subnav {
   text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.2);
 }
 div.subnav-fixed {
-  top: 50px;
+  top: 51px;
 }
 .btn {
   background-color: #ffffff;

diff --git a/cerulean/bootstrap.min.css b/cerulean/bootstrap.min.css
diff --git a/cerulean/bootswatch.less b/cerulean/bootswatch.less
@@ -114,7 +114,7 @@ div.subnav {
 	text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.2);
 
 	&-fixed {
-		top: @navbarHeight;
+		top: @navbarHeight + 1;
 	}
 }
 

diff --git a/cosmo/bootstrap.css b/cosmo/bootstrap.css
@@ -5223,8 +5223,8 @@ a.text-success:hover {
   color: #080808;
 }
 div.subnav {
-  background-color: #dfdfdf;
-  background-image: none;
+  margin: 0 1px;
+  background: #dfdfdf none;
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
@@ -5249,7 +5249,8 @@ div.subnav .nav > .active > a:hover {
   box-shadow: none;
 }
 div.subnav-fixed {
-  top: 50px;
+  top: 51px;
+  margin: 0;
 }
 .nav .open .dropdown-toggle,
 .nav  > li.dropdown.open.active > a:hover {

diff --git a/cosmo/bootstrap.min.css b/cosmo/bootstrap.min.css
diff --git a/cosmo/bootswatch.less b/cosmo/bootswatch.less
@@ -126,8 +126,8 @@ a.text-success:hover { color: darken(@green, 10%); }
 
 div.subnav {
 
-	background-color: @grayLight;
-	background-image: none;
+	margin: 0 1px;
+	background: @grayLight none;
 	.box-shadow(none);
 	border: none;
 	.border-radius(0);
@@ -145,12 +145,12 @@ div.subnav {
 		border-color: transparent;
 		background-color: @black;
 		color: @white;
-		// border-left-width: 2px;
 		.box-shadow(none);
 	}
 
 	&-fixed {
-		top: @navbarHeight;
+		top: @navbarHeight + 1;
+		margin: 0;
 	}
 }
 
@@ -163,7 +163,6 @@ div.subnav {
 	& > li.dropdown.open.active > a:hover {
 		color: @blue;
 	}
-
 }
 
 .nav-tabs {

diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css
@@ -5262,14 +5262,12 @@ hr {
   }
 }
 div.subnav {
+  margin: 0 1px;
   background-color: #020202;
   background-image: none;
   border: none;
   border-bottom: 1px solid #222222;
 }
-div.subnav.subnav-fixed {
-  top: 50px;
-}
 div.subnav .nav > li > a,
 div.subnav .nav > li:first-child > a,
 div.subnav .nav > li:first-child > a:hover {
@@ -5291,6 +5289,10 @@ div.subnav .nav > li:first-child > a:hover {
 div.subnav .nav li.nav-header {
   text-shadow: none;
 }
+div.subnav-fixed {
+  top: 50px;
+  margin: 0;
+}
 .nav-tabs {
   border-bottom: 1px solid #222222;
 }

diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css
diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less
@@ -165,16 +165,13 @@ hr {
 }
 
 div.subnav {
+
+	margin: 0 1px;
 	background-color: @grayDarker;
 	background-image: none;
 	border: none;
 	border-bottom: 1px solid @grayDark;
 
-
-	&.subnav-fixed {
-		top: @navbarHeight;
-	}
-
 	.nav > li > a,
 	.nav > li:first-child > a,
 	.nav > li:first-child > a:hover {
@@ -198,6 +195,14 @@ div.subnav {
 	.nav li.nav-header {
 		text-shadow: none;
 	}
+
+
+
+
+	&-fixed {
+		top: @navbarHeight;
+		margin: 0;
+	}
 }
 
 // NAV

diff --git a/journal/bootstrap.css b/journal/bootstrap.css
@@ -5277,9 +5277,9 @@ hr {
   }
 }
 div.subnav {
+  margin: 0 1px;
   height: 54px;
-  background-color: #ffffff;
-  background-image: none;
+  background: #ffffff none;
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
@@ -5291,7 +5291,8 @@ div.subnav {
   border-radius: 0;
 }
 div.subnav.subnav-fixed {
-  top: 60px;
+  top: 61px;
+  margin: 0;
 }
 div.subnav .nav > li > a,
 div.subnav .nav > li:first-child > a,