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

less/forms.less

@@ -331,6 +331,9 @@ select:focus:required:invalid {
   border-color: #eee;
   .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
   cursor: not-allowed;
+  // prevent text from wrapping, but still cut it off like an input does
+  overflow: hidden;
+  white-space: nowrap;
 }
 
 // Placeholder text gets special styles; can't be bundled together though for some reason

less/mixins.less

@@ -545,7 +545,7 @@
     .offsetX (0) {}
 
     .offset (@columns) {
-      margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+      margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1));
     }
 
     .span (@columns) {

less/tests/css-tests.html

@@ -374,6 +374,19 @@
     </ul>
   </li>
 </ul>
+
+<h4>Dropdown on a button</h4>
+<div style="position: relative;">
+  <button class="btn" type="button" data-toggle="dropdown">Dropdown <span class="caret"></span></button>
+  <ul class="dropdown-menu">
+    <li><a href="#">Action</a></li>
+    <li><a href="#">Another action</a></li>
+    <li><a href="#">Something else here</a></li>
+    <li class="divider"></li>
+    <li><a href="#">Separated link</a></li>
+  </ul>
+</div>
+
 <br>
 
 
@@ -445,6 +458,7 @@
 </div>
 
 
+
 <!-- Tabs
 ================================================== -->
 
@@ -491,6 +505,8 @@
 
 
 
+
+
      <!-- Footer
       ================================================== -->
       <footer class="footer">

less/variables.less

@@ -197,8 +197,6 @@
 @gridColumns:             12;
 @gridColumnWidth:         60px;
 @gridGutterWidth:         20px;
-@gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-
 
 // Fluid grid
 // -------------------------