rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00
Code Issues Actions Packages Releases Activity

Less specific dropdown styles, change up navbar dropdown styles

Browse Source
This commit is contained in:
Mark Otto 2013-05-12 16:30:54 -07:00
parent 09098a7923
commit 41a76e8e7a
3 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
docs/assets/css/bootstrap.css vendored
View File

@ -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 {
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 {
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;
} }

34
less/navbar.less
View File

@ -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 @@
// 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;
} }

22
less/navs.less
View File

@ -44,18 +44,18 @@
+ .nav-header { + .nav-header {
margin-top: 9px; margin-top: 9px;
} }
}
// Open dropdowns // Open dropdowns
&.open > a, &.open > a,
&.open > a:hover, &.open > a:hover,
&.open > a:focus { &.open > a:focus {
color: #fff; color: #fff;
background-color: @link-color; background-color: @link-color;
border-color: @link-color; border-color: @link-color;
.caret { .caret {
border-top-color: #fff; border-top-color: #fff;
border-bottom-color: #fff; border-bottom-color: #fff;
}
} }
} }