mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 21:49:09 +01:00
Code Issues Releases Wiki Activity

fix #3111, badge and label alignment with surrounding text

Browse Source
This commit is contained in:
Mark Otto 2012-04-18 09:47:30 -07:00
parent 62a0f5fdcb
commit 47b6e6bd80
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/css/bootstrap.css vendored
View File

@ -3740,7 +3740,7 @@ a.thumbnail:hover {
font-weight: bold;
line-height: 14px;
color: #ffffff;
vertical-align: middle;
vertical-align: baseline;
white-space: nowrap;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #999999;

2
less/labels-badges.less
View File

@ -8,7 +8,7 @@
font-weight: bold;
line-height: 14px; // ensure proper line-height if floated
color: @white;
vertical-align: middle;
vertical-align: baseline;
white-space: nowrap;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
background-color: @grayLight;

28
less/tests/css-tests.html
View File

@ -462,6 +462,10 @@
<!-- Tabs
================================================== -->
<div class="page-header">
<h1>Tabs</h1>
</div>
<div class="tabbable tabs-left" style="margin-bottom: 18px;">
<ul class="nav nav-tabs">
<li class="active"><a href="#tab1" data-toggle="tab">Section 1</a></li>
@ -502,6 +506,30 @@
<!-- Labels
================================================== -->
<div class="page-header">
<h1>Labels</h1>
</div>
<div class="row">
<div class="span4">
<h4>Inline label</h4>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Maecenas sed diam <span class="label label-warning">Label name</span> eget risus varius blandit sit amet non magna. Fusce <code>.class-name</code> dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
</div><!--/span-->
<div class="span4">
<form class="form-horizontal">
<label>Example label</label>
<input type="text" placeholder="Input"> <span class="help-inline"><span class="label">Hey!</span> Read this.</span>
</form>
</div><!--/span-->
<div class="span4">
</div><!--/span-->
</div><!--/row-->