diff options
| author | Mark Otto <[email protected]> | 2013-02-05 19:39:49 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-05 19:39:49 -0800 |
| commit | 15c7e73abd8d97f0139d177d05c94e26faa17dd2 (patch) | |
| tree | 5d9a2317d17b669fe4a9ce6863ea59f0ddeea430 /less/dropdowns.less | |
| parent | cb0fed66933d179b5bc3669a1df7df00b5688cbe (diff) | |
| parent | c55329085ebc6d05d91412251331c0613ea2250b (diff) | |
| download | bootstrap-15c7e73abd8d97f0139d177d05c94e26faa17dd2.tar.xz bootstrap-15c7e73abd8d97f0139d177d05c94e26faa17dd2.zip | |
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
Diffstat (limited to 'less/dropdowns.less')
| -rw-r--r-- | less/dropdowns.less | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/less/dropdowns.less b/less/dropdowns.less index a0d4b1fd0..13490a637 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -83,11 +83,12 @@ } } -// Hover state +// Hover/Focus state // ----------- .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus, -.dropdown-submenu:hover > a { +.dropdown-submenu:hover > a, +.dropdown-submenu:focus > a { text-decoration: none; color: @dropdownLinkColorHover; #gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%)); @@ -96,7 +97,8 @@ // Active state // ------------ .dropdown-menu > .active > a, -.dropdown-menu > .active > a:hover { +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { color: @dropdownLinkColorActive; text-decoration: none; outline: 0; @@ -105,13 +107,15 @@ // Disabled state // -------------- -// Gray out text and ensure the hover state remains gray +// Gray out text and ensure the hover/focus state remains gray .dropdown-menu > .disabled > a, -.dropdown-menu > .disabled > a:hover { +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { color: @grayLight; } -// Nuke hover effects -.dropdown-menu > .disabled > a:hover { +// Nuke hover/focus effects +.dropdown-menu > .disabled > a:hover +.dropdown-menu > .disabled > a:focus { text-decoration: none; background-color: transparent; background-image: none; // Remove CSS gradient |