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 fc5253aae37a8c1a05e2feb48f4684395db224e4..19961c92c710006d6282b22d318b38306214b3b6 100644 (file)
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 e9ca59ab25dc17bfde2b24689f8c391fb5dc23c2..5e3175306f6a50f9b2e7a0ec5fd5fcddec9e3fe0 100644 (file)
--- 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 fa2ec4904d7cf7b90fd29e5cb3b6c3483cbcc8a4..251c4f60d12240e3432537b2a7f99524b5a71264 100644 (file)
--- 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);