diff options
| author | Mark Otto <[email protected]> | 2012-12-20 13:47:36 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-20 13:47:36 -0800 |
| commit | a5e04c0799b64421f413321c29455e93187ad35a (patch) | |
| tree | 44d69a1f19000ae4e8156ffc5b73dc843d244975 /less/dropdowns.less | |
| parent | 00ff34b9e6671d9363ce5cb1d11aaa6bd45e995a (diff) | |
| parent | 5e4f663e699d6c03cf6c778d39ecac6cb949e285 (diff) | |
| download | bootstrap-a5e04c0799b64421f413321c29455e93187ad35a.tar.xz bootstrap-a5e04c0799b64421f413321c29455e93187ad35a.zip | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/templates/pages/base-css.mustache
less/dropdowns.less
less/forms.less
Diffstat (limited to 'less/dropdowns.less')
| -rw-r--r-- | less/dropdowns.less | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/less/dropdowns.less b/less/dropdowns.less index 93fb5e11c..312d632ce 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -64,7 +64,7 @@ } // Links within the dropdown menu - li > a { + > li > a { display: block; padding: 3px 20px; clear: both; @@ -86,8 +86,8 @@ // Active state // ------------ -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover { color: @dropdown-link-color-active; text-decoration: none; outline: 0; @@ -97,12 +97,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 |