diff options
| author | Jacob Thornton <[email protected]> | 2012-05-17 00:23:11 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-05-17 00:23:11 -0700 |
| commit | a7b49a7d92a0efa640179b775e309002afc50390 (patch) | |
| tree | 3169a2ee9655cb30cf30a99098bb6ca92ea288ea /less | |
| parent | 10c6db4b14e5eb26bd663996233e3ac3075d5cb4 (diff) | |
| download | bootstrap-a7b49a7d92a0efa640179b775e309002afc50390.tar.xz bootstrap-a7b49a7d92a0efa640179b775e309002afc50390.zip | |
nearly everything working with activedescendant... then decide it's wrong.
Diffstat (limited to 'less')
| -rw-r--r-- | less/dropdowns.less | 15 | ||||
| -rw-r--r-- | less/navbar.less | 5 |
2 files changed, 17 insertions, 3 deletions
diff --git a/less/dropdowns.less b/less/dropdowns.less index 96dfec223..c27e73ded 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 { @@ -90,11 +95,17 @@ // ----------- .dropdown-menu li > a:hover, .dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu .active > a:hover, +.dropdown-menu:hover #aria-active > a:hover, +.dropdown-menu #aria-active > a { color: @dropdownLinkColorHover; text-decoration: none; background-color: @dropdownLinkBackgroundHover; } +.dropdown-menu:hover #aria-active > a { + color: @dropdownLinkColor; + background-color: @dropdownBackground; +} // Open state for the dropdown // --------------------------- diff --git a/less/navbar.less b/less/navbar.less index 4faa7255b..f6717dcfa 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -228,6 +228,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; @@ -236,7 +237,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; @@ -343,6 +345,7 @@ } // Dropdown link on hover +.navbar .nav li.dropdown.active > .dropdown-toggle:focus, .navbar .nav li.dropdown.active > .dropdown-toggle:hover { color: @white; } |