rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-18 15:54:26 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

Browse Source
This commit is contained in:
Jacob Thornton 2012-04-18 13:15:58 -07:00
commit b627898919
6 changed files with 37 additions and 8 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; font-weight: bold;
line-height: 14px; line-height: 14px;
color: #ffffff; color: #ffffff;
vertical-align: middle; vertical-align: baseline;
white-space: nowrap; white-space: nowrap;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #999999; background-color: #999999;

6
docs/scaffolding.html
View File

@ -533,13 +533,13 @@
@media (max-width: 480px) { ... } @media (max-width: 480px) { ... }
// Landscape phone to portrait tablet // Landscape phone to portrait tablet
@media (max-width: 768px) { ... } @media (max-width: 767px) { ... }
// Portrait tablet to landscape and desktop // Portrait tablet to landscape and desktop
@media (min-width: 768px) and (max-width: 980px) { ... } @media (min-width: 768px) and (max-width: 979px) { ... }
// Large desktop // Large desktop
@media (min-width: 1200px) { .. } @media (min-width: 1200px) { ... }
</pre> </pre>
</div><!-- /.span --> </div><!-- /.span -->
</div><!-- /.row --> </div><!-- /.row -->

6
docs/templates/pages/scaffolding.mustache vendored
View File

@ -456,13 +456,13 @@
@media (max-width: 480px) { ... } @media (max-width: 480px) { ... }
// {{_i}}Landscape phone to portrait tablet{{/i}} // {{_i}}Landscape phone to portrait tablet{{/i}}
@media (max-width: 768px) { ... } @media (max-width: 767px) { ... }
// {{_i}}Portrait tablet to landscape and desktop{{/i}} // {{_i}}Portrait tablet to landscape and desktop{{/i}}
@media (min-width: 768px) and (max-width: 980px) { ... } @media (min-width: 768px) and (max-width: 979px) { ... }
// {{_i}}Large desktop{{/i}} // {{_i}}Large desktop{{/i}}
@media (min-width: 1200px) { .. } @media (min-width: 1200px) { ... }
</pre> </pre>
</div><!-- /.span --> </div><!-- /.span -->
</div><!-- /.row --> </div><!-- /.row -->

2
less/labels-badges.less
View File

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

1
less/mixins.less
View File

@ -291,6 +291,7 @@
.user-select(@select) { .user-select(@select) {
-webkit-user-select: @select; -webkit-user-select: @select;
-moz-user-select: @select; -moz-user-select: @select;
-ms-user-select: @select;
-o-user-select: @select; -o-user-select: @select;
user-select: @select; user-select: @select;
} }

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

@ -462,6 +462,10 @@
<!-- Tabs <!-- Tabs
================================================== --> ================================================== -->
<div class="page-header">
<h1>Tabs</h1>
</div>
<div class="tabbable tabs-left" style="margin-bottom: 18px;"> <div class="tabbable tabs-left" style="margin-bottom: 18px;">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#tab1" data-toggle="tab">Section 1</a></li> <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-->