diff options
| author | Mark Otto <markdotto@gmail.com> | 2012-01-31 21:40:11 +0400 |
|---|---|---|
| committer | Mark Otto <markdotto@gmail.com> | 2012-01-31 21:40:11 +0400 |
| commit | 09b9b8a586edf7463bb3bb0a88d29e5e41f4e4a5 (patch) | |
| tree | 95dd0709c5a9e9caef240d2b3c1f0ba8d6f8e8cf | |
| parent | 9cfae03fd493b4fdadb0fe873fe63831cfb5ccfd (diff) | |
| parent | 4bd1ba4e0dc44d1d16161306576548f378ab1f8a (diff) | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
| -rw-r--r-- | docs/base-css.html | 5 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 803baa0151..7440603d58 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1155,7 +1155,7 @@ For example, <code>section</code> should be wrapped as inline. <input type="checkbox" name="optionsCheckboxList3" value="option3"> Option three can—yes, you guessed it—also be checked and included in form results </label> - <p class="help-text"><strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.</p> + <p class="help-block"><strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.</p> </div> </div> <div class="control-group"> @@ -1188,6 +1188,9 @@ For example, <code>section</code> should be wrapped as inline. <hr> <h4>Inline forms and append/prepend</h4> <p>To use prepend or append inputs in an inline form, be sure to place the <code>.add-on</code> and <code>input</code> on the same line, without spaces.</p> + <hr> + <h4>Form help text</h4> + <p>To add help text for your form inputs, include inline help text with <code><span class="help-inline"></code> or a help text block with <code><p class="help-block"></code> after the input element.</p> </div> </div><!-- /row --> </section> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index cfa20ea205..cc235ffd01 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1079,7 +1079,7 @@ <input type="checkbox" name="optionsCheckboxList3" value="option3"> {{_i}}Option three can—yes, you guessed it—also be checked and included in form results{{/i}} </label> - <p class="help-text">{{_i}}<strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.{{/i}}</p> + <p class="help-block">{{_i}}<strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.{{/i}}</p> </div> </div> <div class="control-group"> @@ -1112,6 +1112,9 @@ <hr> <h4>{{_i}}Inline forms and append/prepend{{/i}}</h4> <p>{{_i}}To use prepend or append inputs in an inline form, be sure to place the <code>.add-on</code> and <code>input</code> on the same line, without spaces.{{/i}}</p> + <hr> + <h4>{{_i}}Form help text{{/i}}</h4> + <p>{{_i}}To add help text for your form inputs, include inline help text with <code><span class="help-inline"></code> or a help text block with <code><p class="help-block"></code> after the input element.{{/i}}</p> </div> </div><!-- /row --> </section> |