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 zc-m!_2Q*yy7srQD24M&hqC|-r(d&+hoeWWqHrkNYLbOpQON2-e zbwrI8eTZH|Bt-bLo9utfd*|JA?&o*!{grpl{e4SH!8xVibGn*fGHTG-LyJo~$4#;7 zsHL;+h-pS&fc%N+a7ns+6l*^*8|f*?fd2v39IGdMs7?V!pBnLl;IY)pl(cj>^Iso! z#5$Bqfk4!l`11lkM;p$&hysOT&H_3w;B$9SOXkqlksW-y6WNI9g>V9=% z)N?;LG**|g`$!nLJ?nYGmUc360X|BePpcqLBYPQgpKM3h?D@j$n~M*{og}yyE{`02 zITT;I`*rl80-@9T!lFpYH1ne3V;QH6-79-p_pO9`Ogp65Y?kO-m6_4S9!7oz}3|()y&8ews_YCbh&@WQZ zkq^d!zIuj@Z$WKc%PJLm5^yCSs}Q~Vb{tQ-BPT6=aKKBO+YPjznMLG7R^-y)ttNT} z1H?mE2qF2Mi|l%kkA;(U>`cHwRFc`no#b3Ds!2}Rrv-grqb*d6-JN%H zLmZXg|F}iX-D~98(qJQ=ayoFUv63c7mEW2JmYK^^5Iavjs?Hhi3Uf;~TTEOT?A)+tEjfZ^c$`P#u|xCd(q!-+UJE zW(dvN9AkCAa*6qt?iG@Oi}^EN&mKh^R57Eyc17*++BJi%rfz6%>cK0{h?oZ+?slcw z!{Ri4EM~5?E`qPhT(7f*qPDAM06W4BVjM!bu_Ntag){P(=k&j&$>eY(I*F7M2pnk& z`|QJyR`9?4!fF8|w{(#=9bYl>0^yOk3MsMZ5#KT8#tkwuYu^n=Uv~)_9aPdFIKB_I zl_`}?GUrrXUUz@MT(QZk?+~jM+wq-L&>|;*$2?|ki%^TTj8FAgWS;pBj6l^MEsfMw zQwpMBagT3Ls>a)u7qpBQ$*Zlxo zn(X<;GCpRh&nr&&WovjP$hNaMezl301hj=1?0r*Nc}#iM(V0#gHw1Lng|`ztYAVD* zAk;My&}9%i$QFgdI8ifUaD&uTR3Pw=w%mR*{VKrE!*@P@SBz>%l|s}gO1|cjFdvm;# z%@d$WtxC0fEi-NOcfLxEYbqOC=_W8@64&fG>xo#=&<3O%-yYmHmTQaNoC-)7XRPGst4YL>B&5L;CRC&{RsUe3VWMs8|r!t>uq&o zLB~a5z5De!9g~TEQ2d;*0=$PpuVX%#1S++m;pms~sOA+y^5*3GfM%a+50mCQcL5z& zZSi@NN5j1>U!clwU1gTuuo?uik2j=YVxt)Hc8HASk|(Ze*rZ8MQ6sj1bO%sCk#iVp z1Rp0s85qCtjnbYUbZb;^|;_#by1>{6Y@BvoXfW>LV?d%ibz*fuX@jMG+PTz$I{vG z%`%96^mCVXT!}4pZkjU!H&sbmD=MnvQ1+}~$9Z02mc76V$S=xO)OmXF0?2h%X*LF% z@7u`f_;$UZxq+UIuj1m9aX<*iJiXQlD_yAJiaI^@S54$Xns^a4Q&}6thZe6o1aIu2 zV}Fp8a}%qym5=7BJ!vt{y^tS*PU6%ZvTe|g)f>WF7}h{nB+ZKmdPBP$FL<9hso%QQ z7eicLIfxgof3{@ve#Z}}RDu%*aVw^2aB=w6m4n*3ZTFC4StTGV=XF!$k&row>g@wv zNqA;&-Gp=9Wf_H{3CoO&Jfiyn4IJn_f6C41E>nF23_f2zz_aP8Mn#uDi;v>;noe(x zw5w;D15~Tm!h16t>wuVXTtrFj)?p9I?sc77E0~m1gXPo$Fv*%8^0kQ2(cIGvdtNJ5 z7oc)Wty-nzA8SaBPtCEm&sYkeYsius|-F{KK0^YMWu5DvbI=1DdS3RD}gO!0^k8ncjfZf>{a-Vu|F=r$z zS(TZFd@&3#W%KSc-V;*%06FRf$Bk{VXENPe^k_hvbuFxsWuq+uA&dP!wW0Ri-`FRU2Uu!HF{73 z{;%IF#)E@Lyn{yu7dJKgFUsKV8P(WF;F>+s4!++w3NSo*Tk$PBr}4VoFpqqXfG=^J z?uox(Wgw?PK;_AlFn;=sthV0bvve(FTBfGy#+(LhZv!}XKKLxaz& z-a6aYgTNt)i#{y7B^bYw_?h1jwJPx};QMNPvb$pmZFlHC3j_v<=m@X3(kh4RN{#NK zPoV!7&u1!`9eUT@NzBObM_c_%E@P(A$e;RGz|Wul4CP1vl+gH((Sd&;TkI8z^?&4* zV8wq3Z~P3_koyeDG)Vsl!lN2^FObsWFe&|Fq^pjYu%U~8DR#_SwqpFvzx}- z%iGiDzSy6~@-y_06^IV8gFDe6%obXV{2v3kL+m7Rm{&uhr2npa?mat;7WVITUA+D* zyZ%?U)q8dl3?}G3_un?#^q!scaswv#JuBu;1BCp~_+~UC6FJ3M<#VU+V=@pZsQ=9S EA7x@gEdT%j 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); -- 2.47.3