diff options
| author | Mark Otto <[email protected]> | 2013-07-17 20:44:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-17 20:44:27 -0700 |
| commit | f0d071832284d968f2cb72b0bb576f8112a349de (patch) | |
| tree | 9766c8da2b7c6890cdc794a2d93d4ca81c191047 /less/badges.less | |
| parent | c5fb401a626c3e0d99a764cb7961e1bd3e619e8f (diff) | |
| parent | bfebf0e490c795601220f74b7089adb4f47acda7 (diff) | |
| download | bootstrap-f0d071832284d968f2cb72b0bb576f8112a349de.tar.xz bootstrap-f0d071832284d968f2cb72b0bb576f8112a349de.zip | |
Merge branch '3.0.0-wip' into bs3_remove_examples
Conflicts:
docs/_includes/nav-getting-started.html
docs/examples/navbar-fixed-top.html
docs/examples/navbar-static-top.html
docs/examples/navbar.html
docs/getting-started.html
Diffstat (limited to 'less/badges.less')
| -rw-r--r-- | less/badges.less | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/less/badges.less b/less/badges.less index 4750cfb75..e1a2e9c5a 100644 --- a/less/badges.less +++ b/less/badges.less @@ -35,16 +35,9 @@ a.badge { } // Quick fix for labels/badges in buttons -.btn { - .badge { - position: relative; - top: -1px; - } -} -.btn-mini { - .badge { - top: 0; - } +.btn .badge { + position: relative; + top: -1px; } // Account for counters in navs |