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

1 files changed, 14 insertions, 1 deletions

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 4263bead3..913eea31a 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -835,7 +835,7 @@
     <div class="span9">
       <form class="well">
         <label>{{_i}}Label name{{/i}}</label>
-        <input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}">
+        <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>
@@ -1002,6 +1002,19 @@
             <span class="help-inline">{{_i}}Woohoo!{{/i}}</span>
           </div>
         </fieldset>
+        <fieldset class="control-group success">
+          <label class="control-label" for="selectError">{{_i}}Select with success{{/i}}</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">{{_i}}Woohoo!{{/i}}</span>
+          </div>
+        </fieldset>
         <fieldset class="form-actions">
           <button type="submit" class="btn primary">{{_i}}Save changes{{/i}}</button>
           <button type="reset" class="btn">{{_i}}Cancel{{/i}}</button>