Merge pull request twbs#573 from kasperp/kasperp-dropdown-btn-dev

mdo · mdo · commit b10d23550490 · 2011-11-12T01:08:06.000-08:00
Fixed IE7 positioning problem in btn-dropdown
diff --git a/bootstrap.css b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Wed Oct 26 15:52:05 PDT 2011
+ * Date: Sun Nov  6 19:50:14 CET 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -1598,6 +1598,9 @@ a.menu:after, .dropdown-toggle:after {
   display: inline-block;
   *display: inline;
 }
+.btn-dropdown .dropdown-menu {
+  *left: 0px;
+}
 .btn-dropdown .dropdown-toggle {
   padding-right: 11px;
 }
@@ -1636,6 +1639,10 @@ a.menu:after, .dropdown-toggle:after {
 .btn-dropdown .large + .dropdown-menu {
   top: 38px;
 }
+.btn-dropdown .small + .dropdown-menu {
+  top: 30px;
+  *top: 31px;
+}
 .tabs, .pills {
   margin: 0 0 18px;
   padding: 0;
diff --git a/bootstrap.min.css b/bootstrap.min.css
diff --git a/lib/patterns.less b/lib/patterns.less
@@ -326,6 +326,10 @@ a.menu:after,
 .btn-dropdown {
   display: inline-block;
   *display: inline;
+  
+  .dropdown-menu {
+     *left: 0px;
+  }
 }
 
 // Define different toggle styles (colors, borders, margin and padding) for dropdown buttons
@@ -372,6 +376,12 @@ a.menu:after,
   top: 38px;
 }
 
+// Change position for small buttons
+.btn-dropdown .small + .dropdown-menu {
+  top: 30px;
+  *top: 31px;
+}
+
 
 // TABS AND PILLS
 // --------------
