fixes #69, subnav-fixed position tweaks

3 files changed, 23 insertions, 35 deletions

diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
index 754203da..b11c0dce 100644
--- a/amelia/bootstrap.css
+++ b/amelia/bootstrap.css
@@ -5241,9 +5241,9 @@ 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;
@@ -5251,10 +5251,6 @@ div.subnav {
   -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
index e4bccabe..a0e0281f 100644
--- a/amelia/bootstrap.min.css
+++ b/amelia/bootstrap.min.css
@@ -870,13 +870,12 @@ hr{border-bottom:1px solid rgba(255, 255, 255, 0.3);}
 .navbar .navbar-text{margin:17px 15px 14px;line-height:20px;}
 .navbar .btn,.navbar .btn-group{padding:4px;}
 .navbar-inverse .dropdown-menu li>a:hover,.navbar-inverse .dropdown-menu li>a:focus,.navbar-inverse .dropdown-submenu:hover>a{background-image:none;background-color:#debb27;}
-@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:rgba(255, 255, 255, 0.9);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.navbar .nav-collapse .nav li>a:hover{background-color:#d92432;} .navbar .nav-collapse .dropdown-menu li>a:hover,.navbar .nav-collapse .dropdown-menu li>a:focus,.navbar .nav-collapse .dropdown-submenu:hover>a{background-image:none;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:none;} .navbar .nav-collapse .navbar-search .search-query{border:2px solid rgba(255, 255, 255, 0.9);} .navbar .nav-collapse .nav-header{color:rgba(255, 255, 255, 0.5);} .navbar-inverse .nav-collapse .nav li>a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:hover{background-color:#e5c953 !important;}}div.subnav{background-color:rgba(42, 99, 105, 0.9);background-image:none;border:0px solid transparent;-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;}
+@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:rgba(255, 255, 255, 0.9);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.navbar .nav-collapse .nav li>a:hover{background-color:#d92432;} .navbar .nav-collapse .dropdown-menu li>a:hover,.navbar .nav-collapse .dropdown-menu li>a:focus,.navbar .nav-collapse .dropdown-submenu:hover>a{background-image:none;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:none;} .navbar .nav-collapse .navbar-search .search-query{border:2px solid rgba(255, 255, 255, 0.9);} .navbar .nav-collapse .nav-header{color:rgba(255, 255, 255, 0.5);} .navbar-inverse .nav-collapse .nav li>a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:hover{background-color:#e5c953 !important;}}div.subnav{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>a{color:rgba(255, 255, 255, 0.9);border-color:transparent;}
 div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-div.subnav .nav>.active>a{background-color:transparent;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-fixed{top:50px;}
+div.subnav .nav>.active>a{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>li>a:hover,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.open>a{border-color:transparent;background-color:rgba(255, 255, 255, 0.4);}
+div.subnav-fixed{top:51px;margin:0;}
 .nav-tabs li.open>.dropdown-toggle,.nav-pills li.open>.dropdown-toggle{background-color:#8AD5DC;color:#e8d069;border-color:transparent;}
 .nav-tabs,.nav-pills{border-color:transparent;}.nav-tabs li>a,.nav-pills li>a{border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:0;-moz-box-shadow:0;box-shadow:0;}
 .nav-tabs li.active>a,.nav-pills li.active>a,.nav-tabs li.active>a:hover,.nav-pills li.active>a:hover{color:rgba(255, 255, 255, 0.9);}
diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
index 4e245ab9..679fa49f 100755
--- 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;
 	}
 }