all: change how nav-collapse is styled to use a media query

3 files changed, 62 insertions, 67 deletions

diff --git a/journal/bootstrap.css b/journal/bootstrap.css
index 78c27abe..7e3aadbf 100644
--- a/journal/bootstrap.css
+++ b/journal/bootstrap.css
@@ -4836,9 +4836,8 @@ hr {
   text-shadow: none;
   text-transform: uppercase;
 }
-.navbar .nav > li.active > a {
+.navbar .nav > .active > a {
   background-color: transparent;
-  color: #000000;
 }
 .navbar .navbar-text {
   margin-top: 21px;
@@ -4854,15 +4853,6 @@ hr {
   -moz-box-shadow: none;
   box-shadow: none;
 }
-.navbar .nav li.dropdown > .dropdown-toggle:hover,
-.navbar .nav li.dropdown.active > .dropdown-toggle:hover {
-  color: #000000;
-}
-.navbar .nav li.dropdown > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open > .dropdown-toggle:hover .caret {
-  border-top-color: #000000;
-  border-bottom-color: #000000;
-}
 .navbar .dropdown-menu {
   top: 85%;
   -webkit-border-radius: 0;
@@ -4873,15 +4863,6 @@ hr {
   font-size: 15px;
   font-weight: bold;
 }
-.navbar .nav-collapse.collapse .nav li > a {
-  color: #000000;
-}
-.navbar .nav-collapse.collapse .nav li > a:hover {
-  background-color: #eeeeee;
-}
-.navbar .nav-collapse.collapse .navbar-text {
-  margin-top: 0;
-}
 .navbar .navbar-search .search-query,
 .navbar .navbar-search .search-query:hover {
   border: 2px solid #eeeeee;
@@ -4899,6 +4880,30 @@ hr {
 .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;
@@ -5062,14 +5067,6 @@ legend {
     border-color: #e5e5e5;
   }
 }
-@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;
-  }
-}
 .pull-right {
   float: right;
 }
diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css
index a2a8cbef..0225159c 100644
--- a/journal/bootstrap.min.css
+++ b/journal/bootstrap.min.css
@@ -814,18 +814,14 @@ hr{border-bottom:1px solid #eeeeee;}
 .navbar{font-family:"News Cycle","Arial Narrow Bold",sans-serif;font-weight:bold;}.navbar .navbar-inner{border-bottom:2px solid #eeeeee;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .navbar .brand{padding:16px 20px 20px;font-size:24px;font-weight:bold;text-shadow:none;text-transform:uppercase;}
 .navbar .nav>li>a{padding:20px 10px 21px;font-size:18px;text-shadow:none;text-transform:uppercase;}
-.navbar .nav>li.active>a{background-color:transparent;color:#000000;}
+.navbar .nav>.active>a{background-color:transparent;}
 .navbar .navbar-text{margin-top:21px;padding-left:10px;padding-right:10px;font-size:18px;line-height:18px;}
 .navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.navbar .nav li.dropdown>.dropdown-toggle:hover,.navbar .nav li.dropdown.active>.dropdown-toggle:hover{color:#000000;}
-.navbar .nav li.dropdown>.dropdown-toggle .caret,.navbar .nav li.dropdown.open>.dropdown-toggle:hover .caret{border-top-color:#000000;border-bottom-color:#000000;}
 .navbar .dropdown-menu{top:85%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.navbar .dropdown-menu a{font-size:15px;font-weight:bold;}
-.navbar .nav-collapse.collapse .nav li>a{color:#000000;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:#eeeeee;}
-.navbar .nav-collapse.collapse .navbar-text{margin-top:0;}
 .navbar .navbar-search .search-query,.navbar .navbar-search .search-query:hover{border:2px solid #eeeeee;color:#888888;}.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;}
-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{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;}
 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;}
@@ -840,7 +836,7 @@ legend{border-bottom:2px solid #eeeeee;font-family:"News Cycle","Arial Narrow Bo
 .modal-header{border-bottom:none;}
 .modal-footer{border-top:none;background:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .close,.close:hover{border-bottom:none;}
-@media (max-width:768px){div.subnav{height:auto;}div.subnav .nav>li.active>a{border-top:none;} div.subnav .nav>li:hover>a,div.subnav .nav>li:first-child:hover>a,div.subnav .nav>li.active:hover>a,div.subnav .nav>li.dropdown.open .dropdown-toggle,div.subnav .nav>li.dropdown.open .dropdown-toggle:hover{background-color:#eeeeee;} .nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-color:#e5e5e5;}}@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;}}.pull-right{float:right;}
+@media (max-width:768px){div.subnav{height:auto;}div.subnav .nav>li.active>a{border-top:none;} div.subnav .nav>li:hover>a,div.subnav .nav>li:first-child:hover>a,div.subnav .nav>li.active:hover>a,div.subnav .nav>li.dropdown.open .dropdown-toggle,div.subnav .nav>li.dropdown.open .dropdown-toggle:hover{background-color:#eeeeee;} .nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-color:#e5e5e5;}}.pull-right{float:right;}
 .pull-left{float:left;}
 .hide{display:none;}
 .show{display:block;}
diff --git a/journal/bootswatch.less b/journal/bootswatch.less
index 3793d709..8d814619 100755
--- a/journal/bootswatch.less
+++ b/journal/bootswatch.less
@@ -86,9 +86,8 @@ hr {
 		text-transform: uppercase;
 	}
 
-	.nav > li.active > a {
+	.nav > .active > a {
 		background-color: transparent;
-		color: @headingsColor;
 	}
 
 	.navbar-text {
@@ -105,17 +104,6 @@ hr {
 		.box-shadow(none);
 	}
 
-	.nav li.dropdown > .dropdown-toggle:hover,
-	.nav li.dropdown.active > .dropdown-toggle:hover {
-		color: @black;
-	}
-
-	.nav li.dropdown > .dropdown-toggle .caret,
-	.nav li.dropdown.open > .dropdown-toggle:hover .caret {
-		border-top-color: @headingsColor;
-		border-bottom-color: @headingsColor;
-	}
-
 	.dropdown-menu {
 
 		top: 85%;
@@ -127,10 +115,29 @@ hr {
 		}
 	}
 
-	.nav-collapse.collapse {
+	.navbar-search .search-query,
+	.navbar-search .search-query:hover {
+		border: 2px solid @grayLighter;
+		color: @textColor;
+		.placeholder(@gray);
+	}
+}
+
+@media (max-width: @navbarCollapseWidth) {
+
+	.nav-collapse .navbar-form,
+	.nav-collapse .navbar-search {
+		margin-bottom: 0;
+		border-top: 2px solid @grayLighter;
+		border-bottom: 2px solid @grayLighter;
+	} 
+
+
+
+	.navbar .nav-collapse {
 
 		.nav li > a {
-			color: @headingsColor;
+			color: @navbarLinkColor;
 
 			&:hover {
 				background-color: @dropdownLinkBackgroundHover;
@@ -142,11 +149,17 @@ hr {
 		}
 	}
 
-	.navbar-search .search-query,
-	.navbar-search .search-query:hover {
-		border: 2px solid @grayLighter;
-		color: @textColor;
-		.placeholder(@gray);
+	.navbar-inverse .nav-collapse {
+
+		.nav li > a {
+			color: @navbarInverseLinkColor;
+
+			&:hover {
+				background-color: #111;
+				background-image: none;
+			}
+		}
+
 	}
 }
 
@@ -306,15 +319,4 @@ legend {
 	.nav > li.dropdown.open.active > a:hover {
 		border-color: #e5e5e5;
 	}
-}
-
-@media (max-width: 979px) {
-
-	.nav-collapse .navbar-form,
-	.nav-collapse .navbar-search {
-		margin-bottom: 0;
-		border-top: 2px solid @grayLighter;
-		border-bottom: 2px solid @grayLighter;
-	} 
-
-}
+}
\ No newline at end of file