aboutsummaryrefslogtreecommitdiff
path: root/docs/base-css.html
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-25 11:49:20 -0800
committerJacob Thornton <[email protected]>2012-01-25 11:49:20 -0800
commit3250ecc674306ab82f9379325e6eec0bb4ba6dd0 (patch)
tree94b46667aa3e73bbabbae618e267359857c6c69c /docs/base-css.html
parent319b65e64b6882ad2184f398f1763543cfa48a16 (diff)
parent06017b26ca5a9c835edb9d42188431fa30c7e499 (diff)
downloadbootstrap-3250ecc674306ab82f9379325e6eec0bb4ba6dd0.tar.xz
bootstrap-3250ecc674306ab82f9379325e6eec0bb4ba6dd0.zip
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs/base-css.html')
-rw-r--r--docs/base-css.html15
1 files changed, 14 insertions, 1 deletions
diff --git a/docs/base-css.html b/docs/base-css.html
index b0a6743f3..1e9a3d942 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -899,7 +899,7 @@
<div class="span9">
<form class="well">
<label>Label name</label>
- <input type="text" class="span3" placeholder="Type something…">
+ <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>
@@ -1066,6 +1066,19 @@
<span class="help-inline">Woohoo!</span>
</div>
</fieldset>
+ <fieldset class="control-group success">
+ <label class="control-label" for="selectError">Select with success</label>
+ <div class="controls">
+ <select name="selectError">
+ <option>1</option>
+ <option>2</option>
+ <option>3</option>
+ <option>4</option>
+ <option>5</option>
+ </select>
+ <span class="help-inline">Woohoo!</span>
+ </div>
+ </fieldset>
<fieldset class="form-actions">
<button type="submit" class="btn primary">Save changes</button>
<button type="reset" class="btn">Cancel</button>