fixes #69, subnav-fixed position tweaks

3 files changed, 9 insertions, 7 deletions

diff --git a/journal/bootstrap.css b/journal/bootstrap.css
index ba5b2af2..6e43fccd 100644
--- 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,
diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css
index 3f5c3cdd..dca81edc 100644
--- a/journal/bootstrap.min.css
+++ b/journal/bootstrap.min.css
@@ -873,7 +873,7 @@ hr{border-bottom:1px solid #eeeeee;}
 .navbar .navbar-search .search-query,.navbar .navbar-search .search-query:hover{border:2px solid #eeeeee;color:#777777;}.navbar .navbar-search .search-query:-moz-placeholder,.navbar .navbar-search .search-query:hover:-moz-placeholder{color:#999999;}
 .navbar .navbar-search .search-query:-ms-input-placeholder,.navbar .navbar-search .search-query:hover:-ms-input-placeholder{color:#999999;}
 .navbar .navbar-search .search-query::-webkit-input-placeholder,.navbar .navbar-search .search-query:hover::-webkit-input-placeholder{color:#999999;}
-@media (max-width:979px){.nav-collapse .navbar-form,.nav-collapse .navbar-search{margin-bottom:0;border-top:2px solid #eeeeee;border-bottom:2px solid #eeeeee;} .navbar .nav-collapse .nav li>a{color:#000000;}.navbar .nav-collapse .nav li>a:hover{background-color:#eeeeee;} .navbar .nav-collapse .navbar-text{margin-top:0;} .navbar-inverse .nav-collapse .nav li>a{color:#bbbbbb;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:#111;background-image:none;}}div.subnav{height:54px;background-color:#ffffff;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:2px solid #eeeeee;border-left:none;border-right:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}div.subnav.subnav-fixed{top:60px;}
+@media (max-width:979px){.nav-collapse .navbar-form,.nav-collapse .navbar-search{margin-bottom:0;border-top:2px solid #eeeeee;border-bottom:2px solid #eeeeee;} .navbar .nav-collapse .nav li>a{color:#000000;}.navbar .nav-collapse .nav li>a:hover{background-color:#eeeeee;} .navbar .nav-collapse .navbar-text{margin-top:0;} .navbar-inverse .nav-collapse .nav li>a{color:#bbbbbb;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:#111;background-image:none;}}div.subnav{margin:0 1px;height:54px;background:#ffffff none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:2px solid #eeeeee;border-left:none;border-right:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}div.subnav.subnav-fixed{top:61px;margin:0;}
 div.subnav .nav>li>a,div.subnav .nav>li:first-child>a,div.subnav .nav>li.active>a{padding:20px 15px;border-left:none;border-right:none;background-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;font-family:"News Cycle","Arial Narrow Bold",sans-serif;color:#000000;font-size:15px;font-weight:bold;}div.subnav .nav>li>a:hover,div.subnav .nav>li:first-child>a:hover,div.subnav .nav>li.active>a:hover{padding:20px 15px;background-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#000000;}
 div.subnav li.dropdown>.dropdown-toggle .caret,div.subnav li.dropdown>.dropdown-toggle:hover .caret,div.subnav li.dropdown.open>.dropdown-toggle .caret{border-top-color:#000000;border-bottom-color:#000000;opacity:1;}
 div.subnav li.dropdown.open .dropdown-toggle,div.subnav li.dropdown.open .dropdown-toggle:hover{background-color:#ffffff;color:#000000;}
diff --git a/journal/bootswatch.less b/journal/bootswatch.less
index 0f6a01b1..676d67e4 100755
--- a/journal/bootswatch.less
+++ b/journal/bootswatch.less
@@ -171,9 +171,9 @@ hr {
 
 div.subnav {
 
+	margin: 0 1px;
 	height: 54px;
-	background-color: @bodyBackground;
-	background-image: none;
+	background: @bodyBackground none;
 	.box-shadow(none);
 	border: 2px solid @grayLighter;
 	border-left: none;
@@ -181,7 +181,8 @@ div.subnav {
 	.border-radius(0);
 
 	&.subnav-fixed {
-		top: @navbarHeight;
+		top: @navbarHeight + 1;
+		margin: 0;
 	}
 
 	.nav > li > a,