From: Mark Otto <markotto@twitter.com>
Date: Tue, 28 Feb 2012 05:50:54 +0000 (-0800)
Subject: set line-height for labels to prevent change in height when floated per #2222
X-Git-Tag: v2.0.2~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ee77f2c1106513adfaa3b81588d67e99093e707;p=thirdparty%2Fbootstrap.git

set line-height for labels to prevent change in height when floated per #2222
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index fc5253aae3..19961c92c7 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e9ca59ab25..5e3175306f 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 fa2ec4904d..251c4f60d1 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);