Merge branch 'charettes-small-button-dropdowns-caret' into 2.0.2-wip

Conflicts: less/dropdowns.less
2026-04-24 03:00:49 -04:00 · 2012-03-05 20:49:39 -08:00
parent 9c2b2c589d efd5e29ff4
commit ac6eff280d
4 changed files with 9 additions and 8 deletions
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -143,8 +143,3 @@
  }
 }

-// Small button dropdowns
-.btn-small .caret {
-  margin-top: 4px;
-}
-
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -32,6 +32,7 @@
  content: "\2193";
 }

+// Place the caret
 .dropdown .caret {
  margin-top: 8px;
  margin-left: 2px;
@@ -41,6 +42,11 @@
  .opacity(100);
 }

+// Small button dropdowns
+.btn-small .caret {
+  margin-top: 6px;
+}
+
 // The dropdown menu (ul)
 // ----------------------
 .dropdown-menu {