aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-08-21 14:15:01 -0700
committerMark Otto <[email protected]>2012-08-21 14:15:01 -0700
commitb1c93c27003b433e6d9a29178ad3d8da8506ebd1 (patch)
treedd03f581ef3cf530b79c1af290e0a3d8c236c3b0
parent311c00a29b9f0db1bdea768f8643cee6b642c24b (diff)
downloadbootstrap-b1c93c27003b433e6d9a29178ad3d8da8506ebd1.tar.xz
bootstrap-b1c93c27003b433e6d9a29178ad3d8da8506ebd1.zip
fixes #4523: more specific selectors on white icon inversion
-rw-r--r--docs/assets/css/bootstrap.css10
-rw-r--r--less/sprites.less10
2 files changed, 16 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e9be8098c..139c5eb17 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 8d5e40e7a..9bf970fa9 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-"],