aboutsummaryrefslogtreecommitdiff
path: root/docs/css.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-12-26 14:09:36 -0600
committerMark Otto <[email protected]>2012-12-26 14:09:36 -0600
commit070109abc1624808873e6e172ff97d27eb05c406 (patch)
tree4154ecbec6a46a9b90ddc9506cced721055411c4 /docs/css.html
parent0da31ceb51e7339e1c7119b3877ce6f5a88ab4fc (diff)
downloadbootstrap-070109abc1624808873e6e172ff97d27eb05c406.tar.xz
bootstrap-070109abc1624808873e6e172ff97d27eb05c406.zip
Remove .controls-row; instead, folks should use .row and .span* for all their grid input sizing needs when multiple inputs per line are required
Diffstat (limited to 'docs/css.html')
-rw-r--r--docs/css.html34
1 files changed, 1 insertions, 33 deletions
diff --git a/docs/css.html b/docs/css.html
index a3133026d..db7cb17e2 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -1538,39 +1538,7 @@ For example, &lt;code&gt;&amp;lt;section&amp;gt;&lt;/code&gt; should be wrapped
...
&lt;/select&gt;
</pre>
-
- <p>For multiple grid inputs per line, <strong>use the <code>.controls-row</code> modifier class for proper spacing</strong>. It floats the inputs to collapse white-space, sets the proper margins, and the clears the float.</p>
- <form class="bs-docs-example" style="padding-bottom: 15px;">
- <div class="controls controls-row">
- <input class="span5" type="text" placeholder=".span5">
- </div>
- <div class="controls controls-row">
- <input class="span4" type="text" placeholder=".span4">
- <input class="span1" type="text" placeholder=".span1">
- </div>
- <div class="controls controls-row">
- <input class="span3" type="text" placeholder=".span3">
- <input class="span2" type="text" placeholder=".span2">
- </div>
- <div class="controls controls-row">
- <input class="span2" type="text" placeholder=".span2">
- <input class="span3" type="text" placeholder=".span3">
- </div>
- <div class="controls controls-row">
- <input class="span1" type="text" placeholder=".span1">
- <input class="span4" type="text" placeholder=".span4">
- </div>
- </form>
-<pre class="prettyprint linenums">
-&lt;div class="controls"&gt;
- &lt;input class="span5" type="text" placeholder=".span5"&gt;
-&lt;/div&gt;
-&lt;div class="controls controls-row"&gt;
- &lt;input class="span4" type="text" placeholder=".span4"&gt;
- &lt;input class="span1" type="text" placeholder=".span1"&gt;
-&lt;/div&gt;
-...
-</pre>
+ <p>If you need multiple inputs on the same line, wrap them in the standard grid markup (with `.row` and `.span*` classes). Each input should have it's own column and will expand to fill the available width automatically.</p>
<h3>Uneditable inputs</h3>
<p>Present data in a form that's not editable without using actual form markup.</p>