aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-27 21:50:54 -0800
committerMark Otto <[email protected]>2012-02-27 21:50:54 -0800
commit9ee77f2c1106513adfaa3b81588d67e99093e707 (patch)
tree0e33cadb74e5d78409878169b6d025ccce88e474
parenta7b96b3e59e6f2c5eca7d92a26780c5cfe20a815 (diff)
downloadbootstrap-9ee77f2c1106513adfaa3b81588d67e99093e707.tar.xz
bootstrap-9ee77f2c1106513adfaa3b81588d67e99093e707.zip
set line-height for labels to prevent change in height when floated per #2222
-rw-r--r--docs/assets/bootstrap.zipbin54559 -> 54569 bytes
-rw-r--r--docs/assets/css/bootstrap.css3
-rw-r--r--less/labels.less3
3 files changed, 4 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index fc5253aae..19961c92c 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e9ca59ab2..5e3175306 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3299,8 +3299,9 @@ a.thumbnail:hover {
padding: 1px 4px 2px;
font-size: 10.998px;
font-weight: bold;
- white-space: nowrap;
+ line-height: 13px;
color: #ffffff;
+ white-space: nowrap;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #999999;
-webkit-border-radius: 3px;
diff --git a/less/labels.less b/less/labels.less
index fa2ec4904..251c4f60d 100644
--- a/less/labels.less
+++ b/less/labels.less
@@ -6,8 +6,9 @@
padding: 1px 4px 2px;
font-size: @baseFontSize * .846;
font-weight: bold;
- white-space: nowrap;
+ line-height: 13px; // ensure proper line-height if floated
color: @white;
+ white-space: nowrap;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
background-color: @grayLight;
.border-radius(3px);