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

This commit is contained in:
Mark Otto 2014-08-23 13:44:41 -07:00
commit a9cd2ce4c9

View file

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