diff options
| author | Mark Otto <[email protected]> | 2012-10-29 22:01:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-10-29 22:01:58 -0700 |
| commit | b5af762ef59e1fa97f4386f5feadb67aa5183fef (patch) | |
| tree | 3bcd0841e6938379e8c8ae7259ee16f27a49ea41 /less/labels-badges.less | |
| parent | 7426ced0fb288a9e86f18da1849ad74f652d219a (diff) | |
| parent | 68cfedb34af198f178128f8c9bc8ea164e44304a (diff) | |
| download | bootstrap-2.2.0.tar.xz bootstrap-2.2.0.zip | |
Merge branch '2.1.2-wip'v2.2.0
Conflicts:
js/bootstrap-dropdown.js
Diffstat (limited to 'less/labels-badges.less')
| -rw-r--r-- | less/labels-badges.less | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/less/labels-badges.less b/less/labels-badges.less index 2f15fec05..d118a0190 100644 --- a/less/labels-badges.less +++ b/less/labels-badges.less @@ -6,6 +6,8 @@ // Base classes .label, .badge { + display: inline-block; + padding: 2px 4px; font-size: @baseFontSize * .846; font-weight: bold; line-height: 14px; // ensure proper line-height if floated @@ -17,11 +19,11 @@ } // Set unique padding and border-radii .label { - padding: 1px 4px 2px; .border-radius(3px); } .badge { - padding: 1px 9px 2px; + padding-left: 9px; + padding-right: 9px; .border-radius(9px); } |