Commit 41a76e8e authored by Mark Otto's avatar Mark Otto

Less specific dropdown styles, change up navbar dropdown styles

parent 09098a79
...@@ -3162,17 +3162,17 @@ button.close { ...@@ -3162,17 +3162,17 @@ button.close {
margin-top: 9px; margin-top: 9px;
} }
.nav > li.open > a, .nav.open > a,
.nav > li.open > a:hover, .nav.open > a:hover,
.nav > li.open > a:focus { .nav.open > a:focus {
color: #fff; color: #fff;
background-color: #428bca; background-color: #428bca;
border-color: #428bca; border-color: #428bca;
} }
.nav > li.open > a .caret, .nav.open > a .caret,
.nav > li.open > a:hover .caret, .nav.open > a:hover .caret,
.nav > li.open > a:focus .caret { .nav.open > a:focus .caret {
border-top-color: #fff; border-top-color: #fff;
border-bottom-color: #fff; border-bottom-color: #fff;
} }
...@@ -3501,27 +3501,27 @@ button.close { ...@@ -3501,27 +3501,27 @@ button.close {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.navbar-nav li.dropdown > a:hover .caret, .navbar-nav > .dropdown > a:hover .caret,
.navbar-nav li.dropdown > a:focus .caret { .navbar-nav > .dropdown > a:focus .caret {
border-top-color: #333333; border-top-color: #333333;
border-bottom-color: #333333; border-bottom-color: #333333;
} }
.navbar-nav li.dropdown.open > .dropdown-toggle, .navbar-nav > .open > a,
.navbar-nav li.dropdown.active > .dropdown-toggle, .navbar-nav > .open > a:hover,
.navbar-nav li.dropdown.open.active > .dropdown-toggle { .navbar-nav > .open > a:focus {
color: #555555; color: #555555;
background-color: #d5d5d5; background-color: #d5d5d5;
} }
.navbar-nav li.dropdown > .dropdown-toggle .caret { .navbar-nav > .dropdown > a .caret {
border-top-color: #777777; border-top-color: #777777;
border-bottom-color: #777777; border-bottom-color: #777777;
} }
.navbar-nav li.dropdown.open > .dropdown-toggle .caret, .navbar-nav > .open > a .caret,
.navbar-nav li.dropdown.active > .dropdown-toggle .caret, .navbar-nav > .open > a:hover .caret,
.navbar-nav li.dropdown.open.active > .dropdown-toggle .caret { .navbar-nav > .open > a:focus .caret {
border-top-color: #555555; border-top-color: #555555;
border-bottom-color: #555555; border-bottom-color: #555555;
} }
...@@ -3587,26 +3587,26 @@ button.close { ...@@ -3587,26 +3587,26 @@ button.close {
background-color: #fff; background-color: #fff;
} }
.navbar-inverse .navbar-nav li.dropdown.open > .dropdown-toggle, .navbar-inverse .navbar-nav > .open > a,
.navbar-inverse .navbar-nav li.dropdown.active > .dropdown-toggle, .navbar-inverse .navbar-nav > .open > a:hover,
.navbar-inverse .navbar-nav li.dropdown.open.active > .dropdown-toggle { .navbar-inverse .navbar-nav > .open > a:focus {
color: #ffffff; color: #ffffff;
background-color: #080808; 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-top-color: #ffffff;
border-bottom-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-top-color: #999999;
border-bottom-color: #999999; border-bottom-color: #999999;
} }
.navbar-inverse .navbar-nav li.dropdown.open > .dropdown-toggle .caret, .navbar-inverse .navbar-nav > .open > a .caret,
.navbar-inverse .navbar-nav li.dropdown.active > .dropdown-toggle .caret, .navbar-inverse .navbar-nav > .open > a:hover .caret,
.navbar-inverse .navbar-nav li.dropdown.open.active > .dropdown-toggle .caret { .navbar-inverse .navbar-nav > .open > a:focus .caret {
border-top-color: #ffffff; border-top-color: #ffffff;
border-bottom-color: #ffffff; border-bottom-color: #ffffff;
} }
......
...@@ -153,26 +153,26 @@ ...@@ -153,26 +153,26 @@
// Dropdown menu items and carets // Dropdown menu items and carets
.navbar-nav { .navbar-nav {
// Caret should match text color on hover // Caret should match text color on hover
li.dropdown > a:hover .caret, > .dropdown > a:hover .caret,
li.dropdown > a:focus .caret { > .dropdown > a:focus .caret {
border-top-color: @navbar-link-hover-color; border-top-color: @navbar-link-hover-color;
border-bottom-color: @navbar-link-hover-color; border-bottom-color: @navbar-link-hover-color;
} }
// Remove background color from open dropdown // Remove background color from open dropdown
li.dropdown.open > .dropdown-toggle, > .open > a,
li.dropdown.active > .dropdown-toggle, > .open > a:hover,
li.dropdown.open.active > .dropdown-toggle { > .open > a:focus {
background-color: @navbar-link-active-bg; background-color: @navbar-link-active-bg;
color: @navbar-link-active-color; color: @navbar-link-active-color;
} }
li.dropdown > .dropdown-toggle .caret { > .dropdown > a .caret {
border-top-color: @navbar-link-color; border-top-color: @navbar-link-color;
border-bottom-color: @navbar-link-color; border-bottom-color: @navbar-link-color;
} }
li.dropdown.open > .dropdown-toggle .caret, > .open > a .caret,
li.dropdown.active > .dropdown-toggle .caret, > .open > a:hover .caret,
li.dropdown.open.active > .dropdown-toggle .caret { > .open > a:focus .caret {
border-top-color: @navbar-link-active-color; border-top-color: @navbar-link-active-color;
border-bottom-color: @navbar-link-active-color; border-bottom-color: @navbar-link-active-color;
} }
...@@ -243,23 +243,23 @@ ...@@ -243,23 +243,23 @@
// Dropdowns // Dropdowns
.navbar-nav { .navbar-nav {
li.dropdown.open > .dropdown-toggle, > .open > a,
li.dropdown.active > .dropdown-toggle, > .open > a:hover,
li.dropdown.open.active > .dropdown-toggle { > .open > a:focus {
background-color: @navbar-inverse-link-active-bg; background-color: @navbar-inverse-link-active-bg;
color: @navbar-inverse-link-active-color; color: @navbar-inverse-link-active-color;
} }
li.dropdown > a:hover .caret { > .dropdown > a:hover .caret {
border-top-color: @navbar-inverse-link-hover-color; border-top-color: @navbar-inverse-link-hover-color;
border-bottom-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-top-color: @navbar-inverse-link-color;
border-bottom-color: @navbar-inverse-link-color; border-bottom-color: @navbar-inverse-link-color;
} }
li.dropdown.open > .dropdown-toggle .caret, > .open > a .caret,
li.dropdown.active > .dropdown-toggle .caret, > .open > a:hover .caret,
li.dropdown.open.active > .dropdown-toggle .caret { > .open > a:focus .caret {
border-top-color: @navbar-inverse-link-active-color; border-top-color: @navbar-inverse-link-active-color;
border-bottom-color: @navbar-inverse-link-active-color; border-bottom-color: @navbar-inverse-link-active-color;
} }
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
+ .nav-header { + .nav-header {
margin-top: 9px; margin-top: 9px;
} }
}
// Open dropdowns // Open dropdowns
&.open > a, &.open > a,
...@@ -57,7 +58,6 @@ ...@@ -57,7 +58,6 @@
border-bottom-color: #fff; border-bottom-color: #fff;
} }
} }
}
// Redeclare pull classes because of specifity // Redeclare pull classes because of specifity
// Todo: consider making these utilities !important to avoid this bullshit // Todo: consider making these utilities !important to avoid this bullshit
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment