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

Conflicts:
	less/dropdowns.less

4 files changed, 9 insertions, 8 deletions

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 914e79630..ea89c1647 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 6c38ef11f..3e0cbf11b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1675,6 +1675,9 @@ table .span24 {
   opacity: 1;
   filter: alpha(opacity=100);
 }
+.btn-small .caret {
+  margin-top: 6px;
+}
 .dropdown-menu {
   position: absolute;
   top: 100%;
@@ -2232,9 +2235,6 @@ button.btn.btn-small, input[type="submit"].btn.btn-small {
   opacity: 0.75;
   filter: alpha(opacity=75);
 }
-.btn-small .caret {
-  margin-top: 4px;
-}
 .alert {
   padding: 8px 35px 8px 14px;
   margin-bottom: 18px;
diff --git a/less/button-groups.less b/less/button-groups.less
index ad93e3dd2..a70d0153d 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -143,8 +143,3 @@
   }
 }
 
-// Small button dropdowns
-.btn-small .caret {
-  margin-top: 4px;
-}
-
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 1e58ebf79..e98dc4557 100644
--- 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 {