aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-12-20 01:34:19 -0800
committerMark Otto <[email protected]>2012-12-20 01:34:19 -0800
commit30d8eb3ed572f2a91c0d4de1326779dec88cd911 (patch)
tree52ae04e835484b334acb689a3166614f66621e6d /less
parent3f493f0d0d81d21c3d6aa6ffac7e881ca00654e6 (diff)
parent0a1434b23b32fb90098da181d75dcc7b420f96a9 (diff)
downloadbootstrap-30d8eb3ed572f2a91c0d4de1326779dec88cd911.tar.xz
bootstrap-30d8eb3ed572f2a91c0d4de1326779dec88cd911.zip
Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip
Diffstat (limited to 'less')
-rw-r--r--less/dropdowns.less16
1 files changed, 8 insertions, 8 deletions
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 484bd3dda..a0d4b1fd0 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -72,7 +72,7 @@
}
// Links within the dropdown menu
- li > a {
+ > li > a {
display: block;
padding: 3px 20px;
clear: both;
@@ -85,8 +85,8 @@
// Hover state
// -----------
-.dropdown-menu li > a:hover,
-.dropdown-menu li > a:focus,
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
.dropdown-submenu:hover > a {
text-decoration: none;
color: @dropdownLinkColorHover;
@@ -95,8 +95,8 @@
// Active state
// ------------
-.dropdown-menu .active > a,
-.dropdown-menu .active > a:hover {
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover {
color: @dropdownLinkColorActive;
text-decoration: none;
outline: 0;
@@ -106,12 +106,12 @@
// Disabled state
// --------------
// Gray out text and ensure the hover state remains gray
-.dropdown-menu .disabled > a,
-.dropdown-menu .disabled > a:hover {
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover {
color: @grayLight;
}
// Nuke hover effects
-.dropdown-menu .disabled > a:hover {
+.dropdown-menu > .disabled > a:hover {
text-decoration: none;
background-color: transparent;
background-image: none; // Remove CSS gradient