diff options
| author | Jacob Thornton <[email protected]> | 2012-04-18 13:15:58 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-18 13:15:58 -0700 |
| commit | b627898919bcd17cafe5b1cae69c555ebb9a769e (patch) | |
| tree | 202e392f7e650ffc276899513f4d16c1d076c192 /less | |
| parent | 8f98c4fbf6085e613314892de5da871dce862b34 (diff) | |
| parent | 47b6e6bd80040cdaa50c27cb7eb11881df679eee (diff) | |
| download | bootstrap-b627898919bcd17cafe5b1cae69c555ebb9a769e.tar.xz bootstrap-b627898919bcd17cafe5b1cae69c555ebb9a769e.zip | |
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Diffstat (limited to 'less')
| -rw-r--r-- | less/labels-badges.less | 2 | ||||
| -rw-r--r-- | less/mixins.less | 1 | ||||
| -rw-r--r-- | less/tests/css-tests.html | 28 |
3 files changed, 30 insertions, 1 deletions
diff --git a/less/labels-badges.less b/less/labels-badges.less index e29f2c434..0fbd7bbc6 100644 --- a/less/labels-badges.less +++ b/less/labels-badges.less @@ -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; diff --git a/less/mixins.less b/less/mixins.less index ddd25d0e4..e0cb5f8a5 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -291,6 +291,7 @@ .user-select(@select) { -webkit-user-select: @select; -moz-user-select: @select; + -ms-user-select: @select; -o-user-select: @select; user-select: @select; } diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 58e25be61..a39dde53d 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -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--> + + |