From 9ee77f2c1106513adfaa3b81588d67e99093e707 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 27 Feb 2012 21:50:54 -0800 Subject: [PATCH] set line-height for labels to prevent change in height when floated per #2222 --- docs/assets/bootstrap.zip | Bin 54559 -> 54569 bytes docs/assets/css/bootstrap.css | 3 ++- less/labels.less | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index fc5253aae37a8c1a05e2feb48f4684395db224e4..19961c92c710006d6282b22d318b38306214b3b6 100644 GIT binary patch delta 3467 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 delta 3350 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 V$V5(Yme9G=|1lW|6x4sF{Rd@YLoEOR 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);