From: Mark Otto <markotto@twitter.com>
Date: Tue, 21 Aug 2012 21:15:01 +0000 (-0700)
Subject: fixes #4523: more specific selectors on white icon inversion
X-Git-Tag: v2.1.1~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1c93c27003b433e6d9a29178ad3d8da8506ebd1;p=thirdparty%2Fbootstrap.git

fixes #4523: more specific selectors on white icon inversion
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e9be8098cd..139c5eb17a 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2046,8 +2046,14 @@ table .span24 {
 /* White icons with optional class, or on hover/active states of certain elements */
 
 .icon-white,
-.nav > .active > a > [class^="icon-"],
-.nav > .active > a > [class*=" icon-"],
+.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-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
 .dropdown-menu > li > a:hover > [class^="icon-"],
 .dropdown-menu > li > a:hover > [class*=" icon-"],
 .dropdown-menu > .active > a > [class^="icon-"],
diff --git a/less/sprites.less b/less/sprites.less
index 8d5e40e7ab..9bf970fa9b 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -30,8 +30,14 @@
 
 /* White icons with optional class, or on hover/active states of certain elements */
 .icon-white,
-.nav > .active > a > [class^="icon-"],
-.nav > .active > a > [class*=" icon-"],
+.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-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
 .dropdown-menu > li > a:hover > [class^="icon-"],
 .dropdown-menu > li > a:hover > [class*=" icon-"],
 .dropdown-menu > .active > a > [class^="icon-"],