Merge branch 'master' of github.com:twbs/bootstrap

a9cd2ce4 · Mark Otto · 32a6d9b4 · 7e8f10fd · a9cd2ce4
Commit a9cd2ce4 authored Aug 23, 2014 by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

less/dropdowns.less less/dropdowns.less +2 -3

No files found.
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -103,9 +103,8 @@
  &:focus {
    color: @dropdown-link-disabled-color;
  }
-}
-// Nuke hover/focus effects
+  // Nuke hover/focus effects
-.dropdown-menu > .disabled > a {
  &:hover,
  &:focus {
    text-decoration: none;