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

3 files changed, 49 insertions, 174 deletions

diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css
index 6617ec4b..40e34d2a 100644
--- a/simplex/bootstrap.css
+++ b/simplex/bootstrap.css
@@ -4797,33 +4797,6 @@ hr {
 .navbar .dropdown-menu a {
   font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
-.navbar .nav li.dropdown.open > .dropdown-toggle,
-.navbar .nav li.dropdown.active > .dropdown-toggle:hover {
-  color: #d9230f;
-}
-.navbar .nav li.dropdown .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-  opacity: 1;
-}
-.navbar .nav li.dropdown .dropdown-toggle:hover .caret,
-.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open .dropdown-toggle .caret {
-  border-top-color: #d9230f;
-  border-bottom-color: #d9230f;
-}
-.navbar .nav-collapse.collapse .nav li > a {
-  color: #555555;
-}
-.navbar .nav-collapse.collapse .nav li > a:hover {
-  background-image: none;
-  background-color: #fbebe9;
-}
-.navbar .nav-collapse.collapse .navbar-form,
-.navbar .nav-collapse.collapse .navbar-search {
-  border-top: 1px solid rgba(128, 128, 128, 0.3);
-  border-bottom: 1px solid rgba(128, 128, 128, 0.3);
-}
 .navbar-inverse .navbar-inner {
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
@@ -4832,24 +4805,33 @@ hr {
 .navbar-inverse .brand:hover {
   color: #ffffff;
 }
-.navbar-inverse .nav li.dropdown.open .dropdown-toggle {
-  color: #ffffff;
-}
-.navbar-inverse .nav li.dropdown .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown .dropdown-toggle:hover .caret,
-.navbar-inverse .nav li.dropdown.active .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown.open .dropdown-toggle .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-.navbar-inverse .nav-collapse.collapse .nav li > a {
-  color: #ffffff;
-}
-.navbar-inverse .nav-collapse.collapse .nav li > a:hover {
-  background-color: rgba(255, 255, 255, 0.1);
-}
-.navbar-inverse .nav-collapse.collapse .nav-header {
-  color: rgba(255, 255, 255, 0.7);
+@media (max-width: 979px) {
+  .navbar .nav-collapse .nav li > a {
+    color: #555555;
+  }
+  .navbar .nav-collapse .nav li > a:hover {
+    background-image: none;
+    background-color: #fbebe9;
+  }
+  .navbar .nav-collapse .nav .active > a {
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+  }
+  .navbar .nav-collapse .navbar-form,
+  .navbar .nav-collapse .navbar-search {
+    border-top: 1px solid rgba(128, 128, 128, 0.3);
+    border-bottom: 1px solid rgba(128, 128, 128, 0.3);
+  }
+  .navbar-inverse .nav-collapse .nav li > a {
+    color: #ffffff;
+  }
+  .navbar-inverse .nav-collapse .nav li > a:hover {
+    background-color: rgba(255, 255, 255, 0.1) !important;
+  }
+  .navbar-inverse .nav-collapse .nav-header {
+    color: rgba(255, 255, 255, 0.7);
+  }
 }
 div.subnav {
   background-image: none;
@@ -4885,28 +4867,6 @@ div.subnav .nav > li.active > a:hover {
   box-shadow: none;
   color: #d9230f;
 }
-div.subnav .nav > li.dropdown.open > a,
-div.subnav .nav > li.dropdown.open > a:hover {
-  border-left-color: transparent;
-  border-right-color: transparent;
-  background-color: transparent;
-  color: #d9230f;
-}
-div.subnav .nav li.dropdown .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-  opacity: 1;
-}
-div.subnav .nav li.dropdown .dropdown-toggle:hover .caret,
-div.subnav .nav li.dropdown.active .dropdown-toggle .caret,
-div.subnav .nav li.dropdown.open .dropdown-toggle .caret {
-  border-top-color: #d9230f;
-  border-bottom-color: #d9230f;
-  opacity: 1;
-}
-div.subnav .dropdown.open:hover .dropdown-toggle {
-  background-color: transparent;
-}
 .nav .nav-header {
   font-size: 13px;
   font-weight: normal;
@@ -5109,13 +5069,6 @@ i[class^="icon-"] {
 .modal-footer {
   background-color: #f7f7f7;
 }
-@media (max-width: 979px) {
-  .nav-collapse.collapse .navbar-form,
-  .nav-collapse.collapse .navbar-search {
-    border-top: 1px solid #eeeeee;
-    border-bottom: 1px solid #eeeeee;
-  }
-}
 .pull-right {
   float: right;
 }
diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css
index 7e5af63c..1351f52f 100644
--- a/simplex/bootstrap.min.css
+++ b/simplex/bootstrap.min.css
@@ -810,24 +810,11 @@ hr{border-bottom:none;}
 .navbar .divider-vertical{height:39px;background-color:#eeeeee;}
 .navbar .navbar-search{margin-top:5px;}.navbar .navbar-search input[type="text"]{margin-bottom:5px;}
 .navbar .dropdown-menu a{font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;}
-.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle:hover{color:#d9230f;}
-.navbar .nav li.dropdown .dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;opacity:1;}
-.navbar .nav li.dropdown .dropdown-toggle:hover .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open .dropdown-toggle .caret{border-top-color:#d9230f;border-bottom-color:#d9230f;}
-.navbar .nav-collapse.collapse .nav li>a{color:#555555;}.navbar .nav-collapse.collapse .nav li>a:hover{background-image:none;background-color:#fbebe9;}
-.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border-top:1px solid rgba(128, 128, 128, 0.3);border-bottom:1px solid rgba(128, 128, 128, 0.3);}
 .navbar-inverse .navbar-inner{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .navbar-inverse .brand:hover{color:#ffffff;}
-.navbar-inverse .nav li.dropdown.open .dropdown-toggle{color:#ffffff;}
-.navbar-inverse .nav li.dropdown .dropdown-toggle .caret,.navbar-inverse .nav li.dropdown .dropdown-toggle:hover .caret,.navbar-inverse .nav li.dropdown.active .dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open .dropdown-toggle .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;}
-.navbar-inverse .nav-collapse.collapse .nav li>a{color:#ffffff;}.navbar-inverse .nav-collapse.collapse .nav li>a:hover{background-color:rgba(255, 255, 255, 0.1);}
-.navbar-inverse .nav-collapse.collapse .nav-header{color:rgba(255, 255, 255, 0.7);}
-div.subnav{background-image:none;background-color:#fefefe;border-bottom:1px solid transparent;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;}div.subnav.subnav-fixed{-webkit-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);}
+@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:#555555;}.navbar .nav-collapse .nav li>a:hover{background-image:none;background-color:#fbebe9;} .navbar .nav-collapse .nav .active>a{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-top:1px solid rgba(128, 128, 128, 0.3);border-bottom:1px solid rgba(128, 128, 128, 0.3);} .navbar-inverse .nav-collapse .nav li>a{color:#ffffff;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(255, 255, 255, 0.1) !important;} .navbar-inverse .nav-collapse .nav-header{color:rgba(255, 255, 255, 0.7);}}div.subnav{background-image:none;background-color:#fefefe;border-bottom:1px solid transparent;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;}div.subnav.subnav-fixed{-webkit-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);}
 div.subnav .nav>li>a{padding:14px 12px 10px;color:#555555;border-left-color:transparent;border-right-color:transparent;}div.subnav .nav>li>a:hover{background-color:transparent;color:#d9230f;}
 div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover{border-left-color:transparent;border-right-color:transparent;background-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#d9230f;}
-div.subnav .nav>li.dropdown.open>a,div.subnav .nav>li.dropdown.open>a:hover{border-left-color:transparent;border-right-color:transparent;background-color:transparent;color:#d9230f;}
-div.subnav .nav li.dropdown .dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;opacity:1;}
-div.subnav .nav li.dropdown .dropdown-toggle:hover .caret,div.subnav .nav li.dropdown.active .dropdown-toggle .caret,div.subnav .nav li.dropdown.open .dropdown-toggle .caret{border-top-color:#d9230f;border-bottom-color:#d9230f;opacity:1;}
-div.subnav .dropdown.open:hover .dropdown-toggle{background-color:transparent;}
 .nav .nav-header{font-size:13px;font-weight:normal;text-transform:none;}
 .nav-tabs >li>a{background-color:#efefef;border:1px solid #ccc;color:#555555;}.nav-tabs >li>a:hover{border:1px solid #ccc;background-color:#fbebe9;color:#d9230f;}
 .nav-tabs >li.active>a,.nav-tabs >li.active>a:hover{background-color:#f7f7f7;}
@@ -864,7 +851,7 @@ i[class^="icon-"]{opacity:0.5;vertical-align:-2px;}
 .modal-header{border-bottom:none;}
 .modal-header,.modal-body{background-color:#fefefe;}
 .modal-footer{background-color:#f7f7f7;}
-@media (max-width:979px){.nav-collapse.collapse .navbar-form,.nav-collapse.collapse .navbar-search{border-top:1px solid #eeeeee;border-bottom:1px solid #eeeeee;}}.pull-right{float:right;}
+.pull-right{float:right;}
 .pull-left{float:left;}
 .hide{display:none;}
 .show{display:block;}
diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less
index 30cd90ad..5917fc8f 100755
--- a/simplex/bootswatch.less
+++ b/simplex/bootswatch.less
@@ -76,31 +76,21 @@ hr {
 		font-family: @headingsFontFamily;
 	}
 
-	.nav li.dropdown.open > .dropdown-toggle,
-	.nav li.dropdown.active > .dropdown-toggle:hover {
-		color: @linkColor;
-	}
+	&-inverse {
 
-	.nav li.dropdown .dropdown-toggle .caret {
-		border-top-color: @textColor;
-		border-bottom-color: @textColor;
-		opacity: 1;
-	}
+		.navbar-inner {
+			.box-shadow(none);
+		}
 
-	.nav li.dropdown .dropdown-toggle:hover .caret,
-	.nav li.dropdown.active > .dropdown-toggle .caret, 
-	.nav li.dropdown.open .dropdown-toggle .caret {
-		border-top-color: @linkColor;
-		border-bottom-color: @linkColor;
+		.brand:hover {
+			color: @white;
+		}
 	}
+}
 
-	.nav > .active > a,
-	.nav > .active > a:hover,
-	.nav > .active > a:focus {
-		// .box-shadow(none);
-	}
+@media (max-width: @navbarCollapseWidth) {
 
-	.nav-collapse.collapse {
+	.navbar .nav-collapse {
 
 		.nav li > a {
 			color: @textColor;
@@ -111,6 +101,9 @@ hr {
 			}
 		}
 
+		.nav .active > a {
+			.box-shadow(none);
+		}
 
 		.navbar-form,
 		.navbar-search {
@@ -119,41 +112,18 @@ hr {
 		}
 	}
 
-	&-inverse {
-
-		.navbar-inner {
-			.box-shadow(none);
-		}
+	.navbar-inverse .nav-collapse {
 
-		.brand:hover {
-			color: @white;
-		}
-
-		.nav li.dropdown.open .dropdown-toggle {
+		.nav li > a {
 			color: @white;
-		}
 
-		.nav li.dropdown .dropdown-toggle .caret,
-		.nav li.dropdown .dropdown-toggle:hover .caret,
-		.nav li.dropdown.active .dropdown-toggle .caret,
-		.nav li.dropdown.open .dropdown-toggle .caret {
-			border-top-color: @white;
-			border-bottom-color: @white;
-		}
-
-		.nav-collapse.collapse {
-
-			.nav li > a {
-				color: @white;
-
-				&:hover {
-					background-color: rgba(255, 255, 255, 0.1);
-				}
+			&:hover {
+				background-color: rgba(255, 255, 255, 0.1) !important;
 			}
+		}
 
-			.nav-header {
-				color: rgba(255, 255, 255, 0.7);
-			}
+		.nav-header {
+			color: rgba(255, 255, 255, 0.7);
 		}
 	}
 }
@@ -190,32 +160,6 @@ div.subnav {
 		.box-shadow(none);
 		color: @linkColor;
 	}
-
-	.nav > li.dropdown.open > a,
-	.nav > li.dropdown.open > a:hover {
-		border-left-color: transparent;
-		border-right-color: transparent;
-		background-color: transparent;
-		color: @linkColor;
-	}
-
-	.nav li.dropdown .dropdown-toggle .caret {
-		border-top-color: @textColor;
-		border-bottom-color: @textColor;
-		opacity: 1;
-	}
-
-	.nav li.dropdown .dropdown-toggle:hover .caret,
-	.nav li.dropdown.active .dropdown-toggle .caret,
-	.nav li.dropdown.open .dropdown-toggle .caret {
-		border-top-color: @linkColor;
-		border-bottom-color: @linkColor;
-		opacity: 1;
-	}
-
-	.dropdown.open:hover .dropdown-toggle {
-		background-color: transparent;
-	}
 }
 
 // NAV
@@ -492,12 +436,3 @@ i[class^="icon-"]{
 
 // MEDIA QUERIES
 // -----------------------------------------------------
-
-@media (max-width: 979px) {
-
-	.nav-collapse.collapse .navbar-form,
-	.nav-collapse.collapse .navbar-search {
-		border-top: 1px solid @grayLighter;
-		border-bottom: 1px solid @grayLighter;
-	}
-}