From: Mark Otto <markotto@twitter.com>
Date: Sun, 15 Apr 2012 23:48:17 +0000 (-0700)
Subject: simplify the left margin for offset grid columns
X-Git-Tag: v2.0.3~5^2~22^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d374fe92e57cc75fa3bc1e664b96ed7f2191c7e0;p=thirdparty%2Fbootstrap.git

simplify the left margin for offset grid columns
---

diff --git a/less/mixins.less b/less/mixins.less
index 73e6ade56d..22666b21c3 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -546,7 +546,7 @@
     .offsetX (0) {}
 
     .offset (@columns) {
-      margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+      margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1));
     }
 
     .span (@columns) {
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index 8dad598c97..58e25be612 100644
--- a/less/tests/css-tests.html
+++ b/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">