diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 91279e1ac2..0700910d34 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 7f409e019c..f84cbe774e 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -852,9 +852,9 @@ For example, <code>section</code> should be wrapped as inline.

Example forms using just form controls, no extra markup

-

Basic form

+

Basic form

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

@@ -866,11 +866,21 @@ 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>
+  <label class="checkbox">
+    <input type="checkbox"> Check me out
+  </label>
+  <button type="submit" class="btn">Submit</button>
+</form>
+
-

Search form

+

Search form

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

@@ -878,11 +888,17 @@ For example, <code>section</code> should be wrapped as inline. +
+<form class="well form-search">
+  <input type="text" class="input-medium search-query">
+  <button type="submit" class="btn">Search</button>
+</form>
+
-

Inline form

+

Inline form

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

@@ -891,6 +907,13 @@ For example, <code>section</code> should be wrapped as inline. +
+<form class="well form-inline">
+  <input type="text" class="input-small" placeholder="Email">
+  <input type="password" class="input-small" placeholder="Password">
+  <button type="submit" class="btn">Go</button>
+</form>
+
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 443d5ca92d..3327594b5e 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -776,9 +776,9 @@

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

-

{{_i}}Basic form{{/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}}

@@ -790,11 +790,22 @@ +
+<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>
+  <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}}Search form{{/i}}

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

@@ -802,11 +813,17 @@ +
+<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}}Inline form{{/i}}

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

@@ -815,6 +832,13 @@ +
+<form class="well form-inline">
+  <input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}">
+  <input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}">
+  <button type="submit" class="btn">{{_i}}Go{{/i}}</button>
+</form>
+