From d6680a50b9d4518449b569259a0f150619d4074d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Mar 2012 18:00:05 -0700 Subject: [PATCH] start rearranging form docs and clear up messaging about required classes and default styles --- docs/assets/bootstrap.zip | Bin 56915 -> 56915 bytes docs/base-css.html | 39 +++++++++---------------- docs/templates/pages/base-css.mustache | 39 +++++++++---------------- 3 files changed, 28 insertions(+), 50 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 97dcb1f1b7857ec4a3e0ec5ea4f6a30cafc7aead..2c5b3d8b2e3a49c4c3e3d6a7ad1c389d39550fa8 100644 GIT binary patch delta 445 zcmcb-hxzgzW}X0VW)?065D@F1$fKz2y}8)m7l=zMxEUB(zA`c}u!sO9QIrL!viX3O zP4=skW&-M)VG9=U-n{Yl1x}#A4iZ}A zWd;+v=jCh+GATf2vV9#VSk!kj)cDESbk+!mj#cb5$$!gtG<$p<7N z3*sf+@v%Bp8(F;~N|F#Q;Nivfa?ua9)iMSJp#5;Az8(9a?fo6A&n1DWj V+TD5A4rUur?!{dvketpvbpYB)rh)(f delta 445 zcmcb-hxzgzW}X0VW)?065Gd=L$fKyNu&LNz35ZK8xEUB(zA`c}u!sO95z5N@CI+ao zDT0+v_N$X-0t(Eq1q&!{+Iaf{Cs1JWS}sSZ$mTCxt{hBdeUq()jo3hjD{R_aEUaq| zQnkp-46F($bkED#7^rGufXrn3I!>@crA=Vtfm*ZcoMBqG)KvExample forms using just form controls, no extra markup
-
+

Basic form

-

With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.

-
-
+

Smart and lightweight defaults without extra markup.

@@ -893,39 +891,30 @@ For example, <code>section</code> should be wrapped as inline. <form class="well"> <label>Label name</label> <input type="text" class="span3" placeholder="Type something…"> - <span class="help-inline">Associated help text!</span> + <span class="help-block">Example block-level help text here.</span> <label class="checkbox"> <input type="checkbox"> Check me out </label> <button type="submit" class="btn">Submit</button> </form> -
-
-
-
-

Search form

-

Reflecting default WebKit styles, just add .form-search for extra rounded search fields.

-
-
- - - - +
+
+

Search form

+

Add .form-search to the form and .search-query to the input.

+
+ + + 
 <form class="well form-search">
   <input type="text" class="input-medium search-query">
   <button type="submit" class="btn">Search</button>
 </form>
-
-
-
-
+

Inline form

-

Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.

-
-
+

Add .form-inline to finesse the vertical alignment and spacing of form controls.

@@ -944,7 +933,7 @@ For example, <code>section</code> should be wrapped as inline. <button type="submit" class="btn">Sign in</button> </form> -
+

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 0fab71941f..9644ea770a 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -798,11 +798,9 @@

{{_i}}Example forms using just form controls, no extra markup{{/i}}

-
+

{{_i}}Basic form{{/i}}

-

{{_i}}With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.{{/i}}

-
-
+

{{_i}}Smart and lightweight defaults without extra markup.{{/i}}

@@ -816,39 +814,30 @@ <form class="well"> <label>{{_i}}Label name{{/i}}</label> <input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}"> - <span class="help-inline">Associated help text!</span> + <span class="help-block">Example block-level help text here.</span> <label class="checkbox"> <input type="checkbox"> {{_i}}Check me out{{/i}} </label> <button type="submit" class="btn">{{_i}}Submit{{/i}}</button> </form> -
-
-
-
-

{{_i}}Search form{{/i}}

-

{{_i}}Reflecting default WebKit styles, just add .form-search for extra rounded search fields.{{/i}}

-
-
- - - - +
+
+

{{_i}}Search form{{/i}}

+

{{_i}}Add .form-search to the form and .search-query to the input.{{/i}}

+
+ + + 
 <form class="well form-search">
   <input type="text" class="input-medium search-query">
   <button type="submit" class="btn">{{_i}}Search{{/i}}</button>
 </form>
-
-
-
-
+

{{_i}}Inline form{{/i}}

-

{{_i}}Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.{{/i}}

-
-
+

{{_i}}Add .form-inline to finesse the vertical alignment and spacing of form controls.{{/i}}

@@ -867,7 +856,7 @@ <button type="submit" class="btn">{{_i}}Sign in{{/i}}</button> </form> -
+