Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <markotto@twitter.com>2012-02-13 08:10:48 +0400
committerMark Otto <markotto@twitter.com>2012-02-13 08:10:48 +0400
commitbe6fdd9a62a41bf4316dbe4c139787a568ac5bb7 (patch)
treef0a0b91eea8e14d9852a9081085fde79174eaa5a /docs
parent4d1f1f0fc7117b9edae1c1b1c0c2c899ffcd72e3 (diff)
add docs for alt form control sizing per #1700
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin53056 -> 53056 bytes
-rw-r--r--docs/base-css.html11
-rw-r--r--docs/templates/pages/base-css.mustache11
3 files changed, 20 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 402c125943..15db21f3cf 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 292e4a3963..d67d1bd554 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1121,7 +1121,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<fieldset>
<legend>Extending form controls</legend>
<div class="control-group">
- <label class="control-label">Form sizes</label>
+ <label class="control-label">Form grid sizes</label>
<div class="controls docs-input-sizes">
<input class="span1" type="text" placeholder=".span1">
<input class="span2" type="text" placeholder=".span2">
@@ -1151,6 +1151,15 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
</div>
</div>
<div class="control-group">
+ <label class="control-label">Alternate sizes</label>
+ <div class="controls docs-input-sizes">
+ <input class="input-mini" type="text" placeholder=".input-mini">
+ <input class="input-small" type="text" placeholder=".input-small">
+ <input class="input-medium" type="text" placeholder=".input-medium">
+ <p class="help-block">You may also use static classes that don't map to the grid, adapt to the responsive CSS styles, or account for varying types of controls (e.g., <code>input</code> vs. <code>select</code>).</p>
+ </div>
+ </div>
+ <div class="control-group">
<label class="control-label" for="prependedInput">Prepended text</label>
<div class="controls">
<div class="input-prepend">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index cb79496a85..4b2f379c58 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1045,7 +1045,7 @@
<fieldset>
<legend>{{_i}}Extending form controls{{/i}}</legend>
<div class="control-group">
- <label class="control-label">{{_i}}Form sizes{{/i}}</label>
+ <label class="control-label">{{_i}}Form grid sizes{{/i}}</label>
<div class="controls docs-input-sizes">
<input class="span1" type="text" placeholder=".span1">
<input class="span2" type="text" placeholder=".span2">
@@ -1075,6 +1075,15 @@
</div>
</div>
<div class="control-group">
+ <label class="control-label">{{_i}}Alternate sizes{{/i}}</label>
+ <div class="controls docs-input-sizes">
+ <input class="input-mini" type="text" placeholder=".input-mini">
+ <input class="input-small" type="text" placeholder=".input-small">
+ <input class="input-medium" type="text" placeholder=".input-medium">
+ <p class="help-block">{{_i}}You may also use static classes that don't map to the grid, adapt to the responsive CSS styles, or account for varying types of controls (e.g., <code>input</code> vs. <code>select</code>).{{/i}}</p>
+ </div>
+ </div>
+ <div class="control-group">
<label class="control-label" for="prependedInput">{{_i}}Prepended text{{/i}}</label>
<div class="controls">
<div class="input-prepend">