mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Code Activity

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse Source
This commit is contained in:
Mark Otto
2012-01-31 09:40:11 -08:00
parent 9cfae03fd4 4bd1ba4e0d
commit 09b9b8a586
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/templates/pages/base-css.mustache
Vendored
+4 -1
View File
@@ -1079,7 +1079,7 @@
<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}}
</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>&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><!-- /row -->
</section>