mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-23 18:40:03 +00:00
Code Issues Projects Releases Wiki Activity

fixes #5275: inline-block badges and labels, then fix padding accordingly

Browse Source
This commit is contained in:
Mark Otto 2012-10-01 12:04:10 -07:00
parent 5035592988
commit bc4f5d565e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5435,6 +5435,8 @@ a.thumbnail:hover {
.label, .label,
.badge { .badge {
display: inline-block;
padding: 2px 4px;
font-size: 11.844px; font-size: 11.844px;
font-weight: bold; font-weight: bold;
line-height: 14px; line-height: 14px;
@ -5446,14 +5448,14 @@ a.thumbnail:hover {
} }
.label { .label {
padding: 1px 4px 2px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
.badge { .badge {
padding: 1px 9px 2px; padding-right: 9px;
padding-left: 9px;
-webkit-border-radius: 9px; -webkit-border-radius: 9px;
-moz-border-radius: 9px; -moz-border-radius: 9px;
border-radius: 9px; border-radius: 9px;

6
less/labels-badges.less
View File

@ -6,6 +6,8 @@
// Base classes // Base classes
.label, .label,
.badge { .badge {
display: inline-block;
padding: 2px 4px;
font-size: @baseFontSize * .846; font-size: @baseFontSize * .846;
font-weight: bold; font-weight: bold;
line-height: 14px; // ensure proper line-height if floated line-height: 14px; // ensure proper line-height if floated
@ -17,11 +19,11 @@
} }
// Set unique padding and border-radii // Set unique padding and border-radii
.label { .label {
padding: 1px 4px 2px;
.border-radius(3px); .border-radius(3px);
} }
.badge { .badge {
padding: 1px 9px 2px; padding-left: 9px;
padding-right: 9px;
.border-radius(9px); .border-radius(9px);
} }