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

3 files changed, 30 insertions, 6 deletions

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 0fe480ecb..600894f38 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -132,6 +132,7 @@ section {
 .subnav {
   width: 100%;
   height: 36px;
+  overflow: hidden;
   background-color: #eeeeee; /* Old browsers */
   background-repeat: repeat-x; /* Repeat the gradient */
   background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
@@ -167,13 +168,10 @@ section {
   color: #333;
 }
 .subnav .nav .active a {
-  background-color: #eee;
+  background-color: #e5e5e5;
 }
 .subnav .nav li:first-child a {
   border-left: 0;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
 }
 .subnav .nav li:last-child a {
   border-right: 0;
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>
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>