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

Conflicts:
	less/dropdowns.less

diff --cc docs/assets/bootstrap.zip
index 914e79630b1b617849db2b98e55919fcb91a5262,9add96d32bff1148c74b92aeeef92b96f854badc..ea89c16476040f2ecdd16483bf8183c3ddf24c10
Binary files differ

diff --cc docs/assets/css/bootstrap.css
index 6c38ef11f1451a9374ca0a75e92d3b4e5746e048,c3e0c0053971a9c9fcfb498869c307c5825a1f00..3e0cbf11bcabda83cdcb0cd37a8806e972a32e07
--- 1/docs/assets/css/bootstrap.css
--- 2/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -1675,6 -1573,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 -2117,9 +2235,6 @@@ button.btn.btn-small, input[type="submi
    opacity: 0.75;
    filter: alpha(opacity=75);
  }
--.btn-small .caret {
--  margin-top: 4px;
--}
  .alert {
    padding: 8px 35px 8px 14px;
    margin-bottom: 18px;

diff --cc less/button-groups.less
Simple merge

diff --cc less/dropdowns.less
index 1e58ebf79787d747fa20d03d7963b79ed13f49e3,66132cd9795f203382d834e9fb0c495c76ff67a1..e98dc45573fb87d1b6171afa2dbd0829eed75716
--- 1/less/dropdowns.less
--- 2/less/dropdowns.less
+++ b/less/dropdowns.less
@@@ -31,7 -29,6 +31,8 @@@
    .opacity(30);
    content: "\2193";
  }
 +
++// Place the caret
  .dropdown .caret {
    margin-top: 8px;
    margin-left: 2px;
@@@ -40,9 -37,11 +41,14 @@@
  .open.dropdown .caret {
    .opacity(100);
  }
 +
+ // Small button dropdowns
+ .btn-small .caret {
+   margin-top: 6px;
+ }
++
  // The dropdown menu (ul)
 +// ----------------------
  .dropdown-menu {
    position: absolute;
    top: 100%;