diff options
| author | Jacob Thornton <[email protected]> | 2012-06-02 16:11:35 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-06-02 16:11:35 -0700 |
| commit | 5e5965ca6fe719e83f5eb06222170b87dba78f02 (patch) | |
| tree | fa6723ece71b5f733d608c6228521609a4adbd99 /less | |
| parent | ebc69356637143c938c07904d10928c11e742196 (diff) | |
| parent | b1d7c34086ec95a2b0507c595e3a353cdc550b9b (diff) | |
| download | bootstrap-5e5965ca6fe719e83f5eb06222170b87dba78f02.tar.xz bootstrap-5e5965ca6fe719e83f5eb06222170b87dba78f02.zip | |
Merge branch 'accessibility' into 2.1.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
docs/javascript.html
docs/templates/pages/javascript.mustache
Diffstat (limited to 'less')
| -rw-r--r-- | less/dropdowns.less | 9 | ||||
| -rw-r--r-- | less/navbar.less | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/less/dropdowns.less b/less/dropdowns.less index 5e232556a..f965d292d 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -34,11 +34,16 @@ margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, +.dropdown a:focus .caret, +.dropdown a:hover .caret, .open .caret { .opacity(100); } +.navbar .nav .open > a { + color: @navbarLinkColorActive; +} + // The dropdown menu (ul) // ---------------------- .dropdown-menu { @@ -89,11 +94,13 @@ // Hover state // ----------- .dropdown-menu li > a:hover, +.dropdown-menu li > a:focus, .dropdown-menu .active > a, .dropdown-menu .active > a:hover { color: @dropdownLinkColorHover; text-decoration: none; background-color: @dropdownLinkBackgroundHover; + outline: 0; } // Open state for the dropdown diff --git a/less/navbar.less b/less/navbar.less index 818f8a5a2..7a5c84648 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -222,6 +222,7 @@ padding: ((@navbarHeight - @elementHeight) / 2 - 1) 5px ((@navbarHeight - @elementHeight) / 2); } // Hover +.navbar .nav > li > a:focus, .navbar .nav > li > a:hover { background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active color: @navbarLinkColorHover; @@ -230,7 +231,8 @@ // Active nav items .navbar .nav .active > a, -.navbar .nav .active > a:hover { +.navbar .nav .active > a:hover, +.navbar .nav .active > a:focus { color: @navbarLinkColorActive; text-decoration: none; background-color: @navbarLinkBackgroundActive; @@ -337,6 +339,7 @@ } // Dropdown link on hover +.navbar .nav li.dropdown.active > .dropdown-toggle:focus, .navbar .nav li.dropdown.active > .dropdown-toggle:hover { color: @white; } |