root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity

fixes #3900: nudge badges in buttons up 1px

This commit is contained in:
Mark Otto 2012-07-30 13:25:27 -07:00
parent b2ebd5c46c
commit a9bf1e6e35
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/assets/css/bootstrap.css vendored
View File

@ -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;

9
less/labels-badges.less
View File

@ -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;
}
}

3
less/tests/css-tests.html
View File

@ -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-->