rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2013-07-15 12:00:10 -07:00
commit ced641b107
4 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/css.html
View File

@ -1456,19 +1456,19 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<p>Validation styles are applied on a per-input basis. With horizontal forms, the <code>&lt;label class="control-label"&gt;</code> will always be styled.</p>
<form class="bs-example form-horizontal">
<div class="control-group has-warning">
<div class="has-warning">
<label class="control-label" for="inputWarning">Input with warning</label>
<div class="controls">
<input type="text" class="input-with-feedback" id="inputWarning">
</div>
</div>
<div class="control-group has-error">
<div class="has-error">
<label class="control-label" for="inputError">Input with error</label>
<div class="controls">
<input type="text" class="input-with-feedback" id="inputError">
</div>
</div>
<div class="control-group has-success">
<div class="has-success">
<label class="control-label" for="inputSuccess">Input with success</label>
<div class="controls">
<input type="text" class="input-with-feedback" id="inputSuccess">
@ -1476,19 +1476,19 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</div>
</form>
{% highlight html %}
<div class="control-group has-warning">
<div class="has-warning">
<label class="control-label" for="inputWarning">Input with warning</label>
<div class="controls">
<input type="text" class="input-with-feedback" id="inputWarning">
</div>
</div>
<div class="control-group has-error">
<div class="has-error">
<label class="control-label" for="inputError">Input with error</label>
<div class="controls">
<input type="text" class="input-with-feedback" id="inputError">
</div>
</div>
<div class="control-group has-success">
<div class="has-success">
<label class="control-label" for="inputSuccess">Input with success</label>
<div class="controls">
<input type="text" class="input-with-feedback" id="inputSuccess">

31
docs/customize.html
View File

@ -398,9 +398,20 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
<label>@line-height-base</label>
<input type="text" placeholder="1.428571429">
<p class="help-block">Used to calculate line-height throughout Bootstrap.</p>
</div>
</div>
<h4>Headings</h4>
<div class="row">
<div class="col-lg-6">
<label>@headings-font-family</label>
<input type="text" placeholder="@font-family-base">
<p class="help-block">Choose a separate font-family for headings.</p>
<label>@headings-font-weight</label>
<input type="text" placeholder="500">
<p class="help-block">Choose a separate font-weight for headings.</p>
</div>
<div class="col-lg-6">
<label>@headings-line-height</label>
<input type="text" placeholder="1.1">
<p class="help-block">Choose a separate line-height for headings.</p>
@ -458,6 +469,24 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
</div>
</div>
<h3>Container sizes</h3>
<p>Define the maximum width of <code>.container</code> for different screen sizes.</p>
<div class="row">
<div class="col-lg-6">
<label>@container-tablet</label>
<input type="text" placeholder="728px">
<p class="help-block">For <code>@screen-small</code> and up.</p>
<label>@container-desktop</label>
<input type="text" placeholder="940px">
<p class="help-block">For <code>@screen-medium</code> and up.</p>
</div>
<div class="col-lg-6">
<label>@container-large-desktop</label>
<input type="text" placeholder="1170px">
<p class="help-block">For <code>@screen-large</code> and up.</p>
</div>
</div>
<h3>Grid system</h3>
<p>Define your custom responsive grid.</p>
<div class="row">
@ -522,7 +551,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
<label>@btn-default-color</label>
<input type="text" placeholder="#fff">
<label>@btn-default-bg</label>
<input type="text" placeholder="#a7a99aa">
<input type="text" placeholder="#474949">
<label>@btn-default-border</label>
<input type="text" placeholder="@btn-default-bg">
<h4>Primary</h4>

2
less/forms.less
View File

@ -437,7 +437,7 @@ input[type="color"] {
}
// Only right align form labels here when the columns stop stacking
@media (min-width: 768px) {
@media (min-width: @screen-tablet) {
.form-horizontal .control-label {
text-align: right;
}

2
less/mixins.less
View File

@ -331,7 +331,7 @@
// --------------------------------------------------
// Short retina mixin for setting background-image and -size
.retina-image(@file-1x, @file-2x, @width-1x, @height-1x) {
.img-retina(@file-1x, @file-2x, @width-1x, @height-1x) {
background-image: url("@{file-1x}");
@media