diff options
| author | Mark Otto <[email protected]> | 2012-11-28 00:42:17 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-28 00:42:17 -0800 |
| commit | 74f51105e980176caddda430959ffc536b3610ec (patch) | |
| tree | daf8b5190910ebf8a757855be3933d02ae567db6 | |
| parent | 942f9c5df4f731720cb28d126e9202ab21c28996 (diff) | |
| download | bootstrap-74f51105e980176caddda430959ffc536b3610ec.tar.xz bootstrap-74f51105e980176caddda430959ffc536b3610ec.zip | |
Fixes #6010: Navbar dropdown caret should match link hover color
| -rw-r--r-- | docs/assets/css/bootstrap.css | 10 | ||||
| -rw-r--r-- | less/navbar.less | 11 |
2 files changed, 21 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6d0e3dc07..f2cd3d3e9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4619,6 +4619,11 @@ input[type="submit"].btn.btn-mini { border-bottom: 0; } +.navbar .nav li.dropdown > a:hover .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} + .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { @@ -4731,6 +4736,11 @@ input[type="submit"].btn.btn-mini { background-color: #111111; } +.navbar-inverse .nav li.dropdown > a:hover .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} + .navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { border-top-color: #999999; border-bottom-color: #999999; diff --git a/less/navbar.less b/less/navbar.less index 2b186f10e..b292b72bb 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -245,6 +245,7 @@ } .navbar .nav .dropdown-toggle .caret { margin-top: 8px; + } // Hover @@ -334,6 +335,12 @@ } } +// Caret should match text color on hover +.navbar .nav li.dropdown > a:hover .caret { + border-top-color: @navbarLinkColorActive; + border-bottom-color: @navbarLinkColorActive; +} + // Remove background color from open dropdown .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, @@ -436,6 +443,10 @@ background-color: @navbarInverseLinkBackgroundActive; color: @navbarInverseLinkColorActive; } + .nav li.dropdown > a:hover .caret { + border-top-color: @navbarInverseLinkColorActive; + border-bottom-color: @navbarInverseLinkColorActive; + } .nav li.dropdown > .dropdown-toggle .caret { border-top-color: @navbarInverseLinkColor; border-bottom-color: @navbarInverseLinkColor; |