Commit 4bd1ba4e authored by Mark Otto's avatar Mark Otto

Merge pull request #1459 from nkryptic/add-help-text

[2.0-wip] Add form help text information to docs
parents a6253f09 d70ba6c5
...@@ -1155,7 +1155,7 @@ For example, <code>section</code> should be wrapped as inline. ...@@ -1155,7 +1155,7 @@ For example, <code>section</code> should be wrapped as inline.
<input type="checkbox" name="optionsCheckboxList3" value="option3"> <input type="checkbox" name="optionsCheckboxList3" value="option3">
Option three can&mdash;yes, you guessed it&mdash;also be checked and included in form results Option three can&mdash;yes, you guessed it&mdash;also be checked and included in form results
</label> </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> </div>
<div class="control-group"> <div class="control-group">
...@@ -1188,6 +1188,9 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -1188,6 +1188,9 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<hr> <hr>
<h4>Inline forms and append/prepend</h4> <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> <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>&lt;span class="help-inline"&gt;</code> or a help text block with <code>&lt;p class="help-block"&gt;</code> after the input element.</p>
</div> </div>
</div><!-- /row --> </div><!-- /row -->
</section> </section>
......
...@@ -1079,7 +1079,7 @@ ...@@ -1079,7 +1079,7 @@
<input type="checkbox" name="optionsCheckboxList3" value="option3"> <input type="checkbox" name="optionsCheckboxList3" value="option3">
{{_i}}Option three can&mdash;yes, you guessed it&mdash;also be checked and included in form results{{/i}} {{_i}}Option three can&mdash;yes, you guessed it&mdash;also be checked and included in form results{{/i}}
</label> </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> </div>
<div class="control-group"> <div class="control-group">
...@@ -1112,6 +1112,9 @@ ...@@ -1112,6 +1112,9 @@
<hr> <hr>
<h4>{{_i}}Inline forms and append/prepend{{/i}}</h4> <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> <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>&lt;span class="help-inline"&gt;</code> or a help text block with <code>&lt;p class="help-block"&gt;</code> after the input element.{{/i}}</p>
</div> </div>
</div><!-- /row --> </div><!-- /row -->
</section> </section>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment