diff options
| author | Mark Otto <[email protected]> | 2012-10-29 22:01:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-10-29 22:01:58 -0700 |
| commit | b5af762ef59e1fa97f4386f5feadb67aa5183fef (patch) | |
| tree | 3bcd0841e6938379e8c8ae7259ee16f27a49ea41 /less/sprites.less | |
| parent | 7426ced0fb288a9e86f18da1849ad74f652d219a (diff) | |
| parent | 68cfedb34af198f178128f8c9bc8ea164e44304a (diff) | |
| download | bootstrap-2.2.0.tar.xz bootstrap-2.2.0.zip | |
Merge branch '2.1.2-wip'v2.2.0
Conflicts:
js/bootstrap-dropdown.js
Diffstat (limited to 'less/sprites.less')
| -rw-r--r-- | less/sprites.less | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/less/sprites.less b/less/sprites.less index 9bf970fa9..9cd2ae3bf 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -30,8 +30,6 @@ /* White icons with optional class, or on hover/active states of certain elements */ .icon-white, -.nav-tabs > .active > a > [class^="icon-"], -.nav-tabs > .active > a > [class*=" icon-"], .nav-pills > .active > a > [class^="icon-"], .nav-pills > .active > a > [class*=" icon-"], .nav-list > .active > a > [class^="icon-"], @@ -41,7 +39,9 @@ .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("@{iconWhiteSpritePath}"); } |