diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 164d0c267a..875d7d9f45 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 b9dbd372f0..0a1ea0d9d5 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -940,10 +940,22 @@ For example, <code>section</code> should be wrapped as inline.

Horizontal forms

+
+

+

Shown on the right are all the default form controls we support. Here's the bulleted list:

+ +
- Controls Bootstrap supports
@@ -1019,31 +1031,27 @@ For example, <code>section</code> should be wrapped as inline. </form>
-
-

What's included

-

Shown on the left are all the default form controls we support. Here's the bulleted list:

-
    -
  • text inputs (text, password, email, etc)
    • -
  • checkbox
    • -
  • radio
    • -
  • select
    • -
  • multiple select
    • -
  • file input
    • -
  • textarea
    • -
-
-

New defaults with v2.0

-

Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.

-

+

Form control states

+
+

Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.

+
+

Form validation

+

It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.

+
+<fieldset
+  class="control-group error">
+  …
+</fieldset>
+
+
- Form control states
@@ -1112,28 +1120,29 @@ For example, <code>section</code> should be wrapped as inline.
-
-

Redesigned browser states

-

Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.

-
-

Form validation

-

It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.

-
-<fieldset
-  class="control-group error">
-  …
-</fieldset>
-
-

+

Extending form controls

+
+

Prepend & append inputs

+

Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.

+
+

Checkboxes and radios

+

Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.

+

Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.

+
+

Inline forms and append/prepend

+

To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.

+
+

Form help text

+

To add help text for your form inputs, include inline help text with <span class="help-inline"> or a help text block with <p class="help-block"> after the input element.

+
- Extending form controls
@@ -1259,20 +1268,6 @@ For example, <code>section</code> should be wrapped as inline.
-
-

Prepend & append inputs

-

Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.

-
-

Checkboxes and radios

-

Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.

-

Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.

-
-

Inline forms and append/prepend

-

To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.

-
-

Form help text

-

To add help text for your form inputs, include inline help text with <span class="help-inline"> or a help text block with <p class="help-block"> after the input element.

-
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 9644ea770a..0b6e17e694 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -863,10 +863,22 @@

{{_i}}Horizontal forms{{/i}}

+
+

{{_i}}{{/i}}

+

{{_i}}Shown on the right are all the default form controls we support. Here's the bulleted list:{{/i}}

+
    +
  • {{_i}}text inputs (text, password, email, etc){{/i}}
    • +
  • {{_i}}checkbox{{/i}}
    • +
  • {{_i}}radio{{/i}}
    • +
  • {{_i}}select{{/i}}
    • +
  • {{_i}}multiple select{{/i}}
    • +
  • {{_i}}file input{{/i}}
    • +
  • {{_i}}textarea{{/i}}
    • +
+
- {{_i}}Controls Bootstrap supports{{/i}}
@@ -942,31 +954,27 @@ </form>
-
-

{{_i}}What's included{{/i}}

-

{{_i}}Shown on the left are all the default form controls we support. Here's the bulleted list:{{/i}}

-
    -
  • {{_i}}text inputs (text, password, email, etc){{/i}}
    • -
  • {{_i}}checkbox{{/i}}
    • -
  • {{_i}}radio{{/i}}
    • -
  • {{_i}}select{{/i}}
    • -
  • {{_i}}multiple select{{/i}}
    • -
  • {{_i}}file input{{/i}}
    • -
  • {{_i}}textarea{{/i}}
    • -
-
-

{{_i}}New defaults with v2.0{{/i}}

-

{{_i}}Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.{{/i}}

-

+

{{_i}}Form control states{{/i}}

+
+

{{_i}}Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.{{/i}}

+
+

{{_i}}Form validation{{/i}}

+

{{_i}}It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.{{/i}}

+
+<fieldset
+  class="control-group error">
+  …
+</fieldset>
+
+
- {{_i}}Form control states{{/i}}
@@ -1035,28 +1043,29 @@
-
-

{{_i}}Redesigned browser states{{/i}}

-

{{_i}}Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.{{/i}}

-
-

{{_i}}Form validation{{/i}}

-

{{_i}}It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.{{/i}}

-
-<fieldset
-  class="control-group error">
-  …
-</fieldset>
-
-

+

{{_i}}Extending form controls{{/i}}

+
+

{{_i}}Prepend & append inputs{{/i}}

+

{{_i}}Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.{{/i}}

+
+

{{_i}}Checkboxes and radios{{/i}}

+

{{_i}}Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.{{/i}}

+

{{_i}}Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.{{/i}}

+
+

{{_i}}Inline forms and append/prepend{{/i}}

+

{{_i}}To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.{{/i}}

+
+

{{_i}}Form help text{{/i}}

+

{{_i}}To add help text for your form inputs, include inline help text with <span class="help-inline"> or a help text block with <p class="help-block"> after the input element.{{/i}}

+
- {{_i}}Extending form controls{{/i}}
@@ -1182,20 +1191,6 @@
-
-

{{_i}}Prepend & append inputs{{/i}}

-

{{_i}}Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.{{/i}}

-
-

{{_i}}Checkboxes and radios{{/i}}

-

{{_i}}Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.{{/i}}

-

{{_i}}Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.{{/i}}

-
-

{{_i}}Inline forms and append/prepend{{/i}}

-

{{_i}}To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.{{/i}}

-
-

{{_i}}Form help text{{/i}}

-

{{_i}}To add help text for your form inputs, include inline help text with <span class="help-inline"> or a help text block with <p class="help-block"> after the input element.{{/i}}

-