diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 97dcb1f1b7..2c5b3d8b2e 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/base-css.html b/docs/base-css.html index 65c6036d40..b9dbd372f0 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -875,11 +875,9 @@ For example, <code>section</code> should be wrapped as inline.

Example 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> -
+