Commit 74f51105 authored by Mark Otto's avatar Mark Otto

Fixes #6010: Navbar dropdown caret should match link hover color

parent 942f9c5d
...@@ -4619,6 +4619,11 @@ input[type="submit"].btn.btn-mini { ...@@ -4619,6 +4619,11 @@ input[type="submit"].btn.btn-mini {
border-bottom: 0; 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.open > .dropdown-toggle,
.navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle,
.navbar .nav li.dropdown.open.active > .dropdown-toggle { .navbar .nav li.dropdown.open.active > .dropdown-toggle {
...@@ -4731,6 +4736,11 @@ input[type="submit"].btn.btn-mini { ...@@ -4731,6 +4736,11 @@ input[type="submit"].btn.btn-mini {
background-color: #111111; 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 { .navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
border-top-color: #999999; border-top-color: #999999;
border-bottom-color: #999999; border-bottom-color: #999999;
......
...@@ -245,6 +245,7 @@ ...@@ -245,6 +245,7 @@
} }
.navbar .nav .dropdown-toggle .caret { .navbar .nav .dropdown-toggle .caret {
margin-top: 8px; margin-top: 8px;
} }
// Hover // Hover
...@@ -334,6 +335,12 @@ ...@@ -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 // Remove background color from open dropdown
.navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.open > .dropdown-toggle,
.navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle,
...@@ -436,6 +443,10 @@ ...@@ -436,6 +443,10 @@
background-color: @navbarInverseLinkBackgroundActive; background-color: @navbarInverseLinkBackgroundActive;
color: @navbarInverseLinkColorActive; color: @navbarInverseLinkColorActive;
} }
.nav li.dropdown > a:hover .caret {
border-top-color: @navbarInverseLinkColorActive;
border-bottom-color: @navbarInverseLinkColorActive;
}
.nav li.dropdown > .dropdown-toggle .caret { .nav li.dropdown > .dropdown-toggle .caret {
border-top-color: @navbarInverseLinkColor; border-top-color: @navbarInverseLinkColor;
border-bottom-color: @navbarInverseLinkColor; border-bottom-color: @navbarInverseLinkColor;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment