diff options
| author | Mark Otto <[email protected]> | 2012-07-30 13:25:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-07-30 13:25:27 -0700 |
| commit | a9bf1e6e354e9833ba365b2a817c12d6b7bfa784 (patch) | |
| tree | e25f6acb8a58f93e32607b57a19fb80357288fc9 | |
| parent | b2ebd5c46ca538142c5cd4164328c56053b5c79d (diff) | |
| download | bootstrap-a9bf1e6e354e9833ba365b2a817c12d6b7bfa784.tar.xz bootstrap-a9bf1e6e354e9833ba365b2a817c12d6b7bfa784.zip | |
fixes #3900: nudge badges in buttons up 1px
| -rw-r--r-- | docs/assets/css/bootstrap.css | 6 | ||||
| -rw-r--r-- | less/labels-badges.less | 9 | ||||
| -rw-r--r-- | less/tests/css-tests.html | 3 |
3 files changed, 17 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fa58f2ef3..dd9b96bc1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5128,6 +5128,12 @@ a.badge:hover { background-color: #1a1a1a; } +.btn .label, +.btn .badge { + position: relative; + top: -1px; +} + @-webkit-keyframes progress-bar-stripes { from { background-position: 40px 0; diff --git a/less/labels-badges.less b/less/labels-badges.less index 7537b188a..527cf6497 100644 --- a/less/labels-badges.less +++ b/less/labels-badges.less @@ -55,3 +55,12 @@ a { &-inverse { background-color: @grayDark; } &-inverse[href] { background-color: darken(@grayDark, 10%); } } + +// Quick fix for labels/badges in buttons +.btn { + .label, + .badge { + position: relative; + top: -1px; + } +} diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index a8f62c3cc..3ded955bf 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -1011,7 +1011,8 @@ </form> </div><!--/span--> <div class="span4"> - + <button class="btn">Action <span class="badge">2</span></button> + <button class="btn">Action <span class="label">2</span></button> </div><!--/span--> </div><!--/row--> |