kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

start rearranging form docs and clear up messaging about required classes and default styles

Browse source
This commit is contained in:
Mark Otto 2012-03-28 18:00:05 -07:00
parent 369ca13c75
commit d6680a50b9
3 changed files with 28 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View file

Binary file not shown.

27
docs/base-css.html
View file

@ -875,11 +875,9 @@ For example, <code>section</code> should be wrapped as inline.
<h2>Example forms <small>using just form controls, no extra markup</small></h2> <h2>Example forms <small>using just form controls, no extra markup</small></h2>
<div class="row"> <div class="row">
<div class="span3"> <div class="span6">
<h3>Basic form</h3> <h3>Basic form</h3>
<p>With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.</p> <p>Smart and lightweight defaults without extra markup.</p>
</div>
<div class="span9">
<form class="well"> <form class="well">
<label>Label name</label> <label>Label name</label>
<input type="text" class="span3" placeholder="Type something…"> <input type="text" class="span3" placeholder="Type something…">
@ -893,7 +891,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
&lt;form class="well"&gt; &lt;form class="well"&gt;
&lt;label&gt;Label name&lt;/label&gt; &lt;label&gt;Label name&lt;/label&gt;
&lt;input type="text" class="span3" placeholder="Type something…"&gt; &lt;input type="text" class="span3" placeholder="Type something…"&gt;
&lt;span class="help-inline"&gt;Associated help text!&lt;/span&gt; &lt;span class="help-block"&gt;Example block-level help text here.&lt;/span&gt;
&lt;label class="checkbox"&gt; &lt;label class="checkbox"&gt;
&lt;input type="checkbox"&gt; Check me out &lt;input type="checkbox"&gt; Check me out
&lt;/label&gt; &lt;/label&gt;
@ -901,13 +899,9 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
&lt;/form&gt; &lt;/form&gt;
</pre> </pre>
</div> </div>
</div> <!-- /row --> <div class="span6">
<div class="row">
<div class="span3">
<h3>Search form</h3> <h3>Search form</h3>
<p>Reflecting default WebKit styles, just add <code>.form-search</code> for extra rounded search fields.</p> <p>Add <code>.form-search</code> to the form and <code>.search-query</code> to the <code>input</code>.</p>
</div>
<div class="span9">
<form class="well form-search"> <form class="well form-search">
<input type="text" class="input-medium search-query"> <input type="text" class="input-medium search-query">
<button type="submit" class="btn">Search</button> <button type="submit" class="btn">Search</button>
@ -918,14 +912,9 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
&lt;button type="submit" class="btn"&gt;Search&lt;/button&gt; &lt;button type="submit" class="btn"&gt;Search&lt;/button&gt;
&lt;/form&gt; &lt;/form&gt;
</pre> </pre>
</div>
</div> <!-- /row -->
<div class="row">
<div class="span3">
<h3>Inline form</h3> <h3>Inline form</h3>
<p>Inputs are block level to start. For <code>.form-inline</code> and <code>.form-horizontal</code>, we use inline-block.</p> <p>Add <code>.form-inline</code> to finesse the vertical alignment and spacing of form controls.</p>
</div>
<div class="span9">
<form class="well form-inline"> <form class="well form-inline">
<input type="text" class="input-small" placeholder="Email"> <input type="text" class="input-small" placeholder="Email">
<input type="password" class="input-small" placeholder="Password"> <input type="password" class="input-small" placeholder="Password">
@ -944,7 +933,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
&lt;button type="submit" class="btn"&gt;Sign in&lt;/button&gt; &lt;button type="submit" class="btn"&gt;Sign in&lt;/button&gt;
&lt;/form&gt; &lt;/form&gt;
</pre> </pre>
</div> </div><!-- /.span -->
</div><!-- /row --> </div><!-- /row -->
<br> <br>

27
docs/templates/pages/base-css.mustache vendored
View file

@ -798,11 +798,9 @@
<h2>{{_i}}Example forms <small>using just form controls, no extra markup</small>{{/i}}</h2> <h2>{{_i}}Example forms <small>using just form controls, no extra markup</small>{{/i}}</h2>
<div class="row"> <div class="row">
<div class="span3"> <div class="span6">
<h3>{{_i}}Basic form{{/i}}</h3> <h3>{{_i}}Basic form{{/i}}</h3>
<p>{{_i}}With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.{{/i}}</p> <p>{{_i}}Smart and lightweight defaults without extra markup.{{/i}}</p>
</div>
<div class="span9">
<form class="well"> <form class="well">
<label>{{_i}}Label name{{/i}}</label> <label>{{_i}}Label name{{/i}}</label>
<input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}"> <input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}">
@ -816,7 +814,7 @@
&lt;form class="well"&gt; &lt;form class="well"&gt;
&lt;label&gt;{{_i}}Label name{{/i}}&lt;/label&gt; &lt;label&gt;{{_i}}Label name{{/i}}&lt;/label&gt;
&lt;input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}"&gt; &lt;input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}"&gt;
&lt;span class="help-inline"&gt;Associated help text!&lt;/span&gt; &lt;span class="help-block"&gt;Example block-level help text here.&lt;/span&gt;
&lt;label class="checkbox"&gt; &lt;label class="checkbox"&gt;
&lt;input type="checkbox"&gt; {{_i}}Check me out{{/i}} &lt;input type="checkbox"&gt; {{_i}}Check me out{{/i}}
&lt;/label&gt; &lt;/label&gt;
@ -824,13 +822,9 @@
&lt;/form&gt; &lt;/form&gt;
</pre> </pre>
</div> </div>
</div> <!-- /row --> <div class="span6">
<div class="row">
<div class="span3">
<h3>{{_i}}Search form{{/i}}</h3> <h3>{{_i}}Search form{{/i}}</h3>
<p>{{_i}}Reflecting default WebKit styles, just add <code>.form-search</code> for extra rounded search fields.{{/i}}</p> <p>{{_i}}Add <code>.form-search</code> to the form and <code>.search-query</code> to the <code>input</code>.{{/i}}</p>
</div>
<div class="span9">
<form class="well form-search"> <form class="well form-search">
<input type="text" class="input-medium search-query"> <input type="text" class="input-medium search-query">
<button type="submit" class="btn">{{_i}}Search{{/i}}</button> <button type="submit" class="btn">{{_i}}Search{{/i}}</button>
@ -841,14 +835,9 @@
&lt;button type="submit" class="btn"&gt;{{_i}}Search{{/i}}&lt;/button&gt; &lt;button type="submit" class="btn"&gt;{{_i}}Search{{/i}}&lt;/button&gt;
&lt;/form&gt; &lt;/form&gt;
</pre> </pre>
</div>
</div> <!-- /row -->
<div class="row">
<div class="span3">
<h3>{{_i}}Inline form{{/i}}</h3> <h3>{{_i}}Inline form{{/i}}</h3>
<p>{{_i}}Inputs are block level to start. For <code>.form-inline</code> and <code>.form-horizontal</code>, we use inline-block.{{/i}}</p> <p>{{_i}}Add <code>.form-inline</code> to finesse the vertical alignment and spacing of form controls.{{/i}}</p>
</div>
<div class="span9">
<form class="well form-inline"> <form class="well form-inline">
<input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}"> <input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}">
<input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}"> <input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}">
@ -867,7 +856,7 @@
&lt;button type="submit" class="btn"&gt;{{_i}}Sign in{{/i}}&lt;/button&gt; &lt;button type="submit" class="btn"&gt;{{_i}}Sign in{{/i}}&lt;/button&gt;
&lt;/form&gt; &lt;/form&gt;
</pre> </pre>
</div> </div><!-- /.span -->
</div><!-- /row --> </div><!-- /row -->
<br> <br>