From: Mark Otto <markotto@twitter.com>
Date: Tue, 6 Mar 2012 04:49:39 +0000 (-0800)
Subject: Merge branch 'charettes-small-button-dropdowns-caret' into 2.0.2-wip
X-Git-Tag: v2.0.2~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac6eff280df58a96bfd429189d2dd2d6e5c38208;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	less/dropdowns.less
---

ac6eff280df58a96bfd429189d2dd2d6e5c38208
diff --cc docs/assets/bootstrap.zip
index 914e79630b,9add96d32b..ea89c16476
Binary files differ
diff --cc docs/assets/css/bootstrap.css
index 6c38ef11f1,c3e0c00539..3e0cbf11bc
--- a/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/dropdowns.less
index 1e58ebf797,66132cd979..e98dc45573
--- a/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%;