aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-05 10:04:38 -0700
committerMark Otto <[email protected]>2012-09-05 10:04:38 -0700
commit3fa4ca2d871ba402f19f9c1d5e358baa023061a8 (patch)
treef84d99ae2f5aefa327bcc0ae3ecb45149d189874 /docs
parent08b8571cb842e9fc668d9faf6c305a51523b27fb (diff)
parentdfb3175d4b7904a4fe3f1d3ec41145c5021484dc (diff)
downloadbootstrap-3fa4ca2d871ba402f19f9c1d5e358baa023061a8.tar.xz
bootstrap-3fa4ca2d871ba402f19f9c1d5e358baa023061a8.zip
Merge branch 'spantaleev-patch-1' into 2.1.2-wip
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap.css2
1 files changed, 0 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index cad0b44e7..8dab9eb23 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2157,8 +2157,6 @@ table [class*=span],
/* 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-"],