Merge branch '2.1.2-wip' into exploratory

This commit is contained in:
Mark Otto
2012-10-02 15:41:31 -07:00
5 changed files with 9 additions and 5 deletions

View File

@@ -1899,7 +1899,9 @@ table [class*=span] {
.dropdown-menu > li > a:hover > [class^="icon-"],
.dropdown-menu > li > a:hover > [class*=" icon-"],
.dropdown-menu > .active > a > [class^="icon-"],
.dropdown-menu > .active > a > [class*=" icon-"] {
.dropdown-menu > .active > a > [class*=" icon-"],
.dropdown-submenu:hover > a > [class^="icon-"],
.dropdown-submenu:hover > a > [class*=" icon-"] {
background-image: url("../img/glyphicons-halflings-white.png");
}