Skip to content

B
bootstrap
Commit 3fa4ca2d authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch 'spantaleev-patch-1' into 2.1.2-wip

parents 08b8571c dfb3175d
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
docs/assets/css/bootstrap.css
View file @ 3fa4ca2d
...@@ -2157,8 +2157,6 @@ table [class*=span], ...@@ -2157,8 +2157,6 @@ table [class*=span],
/* White icons with optional class, or on hover/active states of certain elements */ /* White icons with optional class, or on hover/active states of certain elements */
.icon-white, .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-pills > .active > a > [class*=" icon-"], .nav-pills > .active > a > [class*=" icon-"],
.nav-list > .active > a > [class^="icon-"], .nav-list > .active > a > [class^="icon-"],
......
less/sprites.less
View file @ 3fa4ca2d
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
/* White icons with optional class, or on hover/active states of certain elements */ /* White icons with optional class, or on hover/active states of certain elements */
.icon-white, .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-pills > .active > a > [class*=" icon-"], .nav-pills > .active > a > [class*=" icon-"],
.nav-list > .active > a > [class^="icon-"], .nav-list > .active > a > [class^="icon-"],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment