Less specific dropdown styles, change up navbar dropdown styles

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2ddd9e769785238db6631bd7bac59152845909a1..72bda5c820e53998c761745bc3070614440f1ffc 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3162,17 +3162,17 @@ button.close {
   margin-top: 9px;
 }
 
-.nav > li.open > a,
-.nav > li.open > a:hover,
-.nav > li.open > a:focus {
+.nav.open > a,
+.nav.open > a:hover,
+.nav.open > a:focus {
   color: #fff;
   background-color: #428bca;
   border-color: #428bca;
 }
 
-.nav > li.open > a .caret,
-.nav > li.open > a:hover .caret,
-.nav > li.open > a:focus .caret {
+.nav.open > a .caret,
+.nav.open > a:hover .caret,
+.nav.open > a:focus .caret {
   border-top-color: #fff;
   border-bottom-color: #fff;
 }
@@ -3501,27 +3501,27 @@ button.close {
   border-bottom-left-radius: 0;
 }
 
-.navbar-nav li.dropdown > a:hover .caret,
-.navbar-nav li.dropdown > a:focus .caret {
+.navbar-nav > .dropdown > a:hover .caret,
+.navbar-nav > .dropdown > a:focus .caret {
   border-top-color: #333333;
   border-bottom-color: #333333;
 }
 
-.navbar-nav li.dropdown.open > .dropdown-toggle,
-.navbar-nav li.dropdown.active > .dropdown-toggle,
-.navbar-nav li.dropdown.open.active > .dropdown-toggle {
+.navbar-nav > .open > a,
+.navbar-nav > .open > a:hover,
+.navbar-nav > .open > a:focus {
   color: #555555;
   background-color: #d5d5d5;
 }
 
-.navbar-nav li.dropdown > .dropdown-toggle .caret {
+.navbar-nav > .dropdown > a .caret {
   border-top-color: #777777;
   border-bottom-color: #777777;
 }
 
-.navbar-nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar-nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar-nav li.dropdown.open.active > .dropdown-toggle .caret {
+.navbar-nav > .open > a .caret,
+.navbar-nav > .open > a:hover .caret,
+.navbar-nav > .open > a:focus .caret {
   border-top-color: #555555;
   border-bottom-color: #555555;
 }
@@ -3587,26 +3587,26 @@ button.close {
   background-color: #fff;
 }
 
-.navbar-inverse .navbar-nav li.dropdown.open > .dropdown-toggle,
-.navbar-inverse .navbar-nav li.dropdown.active > .dropdown-toggle,
-.navbar-inverse .navbar-nav li.dropdown.open.active > .dropdown-toggle {
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .open > a:hover,
+.navbar-inverse .navbar-nav > .open > a:focus {
   color: #ffffff;
   background-color: #080808;
 }
 
-.navbar-inverse .navbar-nav li.dropdown > a:hover .caret {
+.navbar-inverse .navbar-nav > .dropdown > a:hover .caret {
   border-top-color: #ffffff;
   border-bottom-color: #ffffff;
 }
 
-.navbar-inverse .navbar-nav li.dropdown > .dropdown-toggle .caret {
+.navbar-inverse .navbar-nav > .dropdown > a .caret {
   border-top-color: #999999;
   border-bottom-color: #999999;
 }
 
-.navbar-inverse .navbar-nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar-inverse .navbar-nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar-inverse .navbar-nav li.dropdown.open.active > .dropdown-toggle .caret {
+.navbar-inverse .navbar-nav > .open > a .caret,
+.navbar-inverse .navbar-nav > .open > a:hover .caret,
+.navbar-inverse .navbar-nav > .open > a:focus .caret {
   border-top-color: #ffffff;
   border-bottom-color: #ffffff;
 }

diff --git a/less/navbar.less b/less/navbar.less
index 975f2ebb2146abfd8f20378719ee1e4fefb1b46f..86768962ddab080679b904cd6919a27701c0c796 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -153,26 +153,26 @@
 // Dropdown menu items and carets
 .navbar-nav {
   // Caret should match text color on hover
-  li.dropdown > a:hover .caret,
-  li.dropdown > a:focus .caret {
+  > .dropdown > a:hover .caret,
+  > .dropdown > a:focus .caret {
     border-top-color: @navbar-link-hover-color;
     border-bottom-color: @navbar-link-hover-color;
   }
 
   // Remove background color from open dropdown
-  li.dropdown.open > .dropdown-toggle,
-  li.dropdown.active > .dropdown-toggle,
-  li.dropdown.open.active > .dropdown-toggle {
+  > .open > a,
+  > .open > a:hover,
+  > .open > a:focus {
     background-color: @navbar-link-active-bg;
     color: @navbar-link-active-color;
   }
-  li.dropdown > .dropdown-toggle .caret {
+  > .dropdown > a .caret {
     border-top-color: @navbar-link-color;
     border-bottom-color: @navbar-link-color;
   }
-  li.dropdown.open > .dropdown-toggle .caret,
-  li.dropdown.active > .dropdown-toggle .caret,
-  li.dropdown.open.active > .dropdown-toggle .caret {
+  > .open > a .caret,
+  > .open > a:hover .caret,
+  > .open > a:focus .caret {
     border-top-color: @navbar-link-active-color;
     border-bottom-color: @navbar-link-active-color;
   }
@@ -243,23 +243,23 @@
 
   // Dropdowns
   .navbar-nav {
-    li.dropdown.open > .dropdown-toggle,
-    li.dropdown.active > .dropdown-toggle,
-    li.dropdown.open.active > .dropdown-toggle {
+    > .open > a,
+    > .open > a:hover,
+    > .open > a:focus {
       background-color: @navbar-inverse-link-active-bg;
       color: @navbar-inverse-link-active-color;
     }
-    li.dropdown > a:hover .caret {
+    > .dropdown > a:hover .caret {
       border-top-color: @navbar-inverse-link-hover-color;
       border-bottom-color: @navbar-inverse-link-hover-color;
     }
-    li.dropdown > .dropdown-toggle .caret {
+    > .dropdown > a .caret {
       border-top-color: @navbar-inverse-link-color;
       border-bottom-color: @navbar-inverse-link-color;
     }
-    li.dropdown.open > .dropdown-toggle .caret,
-    li.dropdown.active > .dropdown-toggle .caret,
-    li.dropdown.open.active > .dropdown-toggle .caret {
+    > .open > a .caret,
+    > .open > a:hover .caret,
+    > .open > a:focus .caret {
       border-top-color: @navbar-inverse-link-active-color;
       border-bottom-color: @navbar-inverse-link-active-color;
     }

diff --git a/less/navs.less b/less/navs.less
index 66fa341e4591417d46b82f3a681debe20eae7dba..e5925bf6370a8a762e50e7454947acba71da9f57 100644 (file)
--- a/less/navs.less
+++ b/less/navs.less
@@ -44,18 +44,18 @@
     + .nav-header {
       margin-top: 9px;
     }
+  }
 
-    // Open dropdowns
-    &.open > a,
-    &.open > a:hover,
-    &.open > a:focus {
-      color: #fff;
-      background-color: @link-color;
-      border-color: @link-color;
-      .caret {
-        border-top-color: #fff;
-        border-bottom-color: #fff;
-      }
+  // Open dropdowns
+  &.open > a,
+  &.open > a:hover,
+  &.open > a:focus {
+    color: #fff;
+    background-color: @link-color;
+    border-color: @link-color;
+    .caret {
+      border-top-color: #fff;
+      border-bottom-color: #fff;
     }
   }