From 23a7ab4b51f0f366bad00b5a8db7c9ee76eec16b Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Nov 2012 18:44:10 -0800
Subject: [PATCH] icon vertical align in buttons

---
 docs/assets/css/bootstrap.css | 19 +++++++++----------
 less/buttons.less             | 16 ++++++++--------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d2b2c24424..6dfc380153 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3286,11 +3286,6 @@ button.close {
           border-radius: 6px;
 }
 
-.btn-large [class^="icon-"],
-.btn-large [class*=" icon-"] {
-  margin-top: 2px;
-}
-
 .btn-small {
   padding: 2px 10px;
   font-size: 11.9px;
@@ -3299,11 +3294,6 @@ button.close {
           border-radius: 3px;
 }
 
-.btn-small [class^="icon-"],
-.btn-small [class*=" icon-"] {
-  margin-top: 0;
-}
-
 .btn-mini {
   padding: 0 6px;
   font-size: 10.5px;
@@ -3312,6 +3302,15 @@ button.close {
           border-radius: 3px;
 }
 
+.btn [class^="icon-"]:before {
+  vertical-align: -2px;
+}
+
+.btn-small [class^="icon-"]:before,
+.btn-mini [class^="icon-"]:before {
+  vertical-align: -1px;
+}
+
 .btn-block {
   display: block;
   width: 100%;
diff --git a/less/buttons.less b/less/buttons.less
index 4497d3acd7..80a31fcf54 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -72,10 +72,6 @@
   font-size: @fontSizeLarge;
   .border-radius(@borderRadiusLarge);
 }
-.btn-large [class^="icon-"],
-.btn-large [class*=" icon-"] {
-  margin-top: 2px;
-}
 
 // Small
 .btn-small {
@@ -83,10 +79,6 @@
   font-size: @fontSizeSmall;
   .border-radius(@borderRadiusSmall);
 }
-.btn-small [class^="icon-"],
-.btn-small [class*=" icon-"] {
-  margin-top: 0;
-}
 
 // Mini
 .btn-mini {
@@ -96,6 +88,14 @@
 }
 
 
+// Icons in buttons
+// -------------------------
+
+.btn [class^="icon-"]:before       { vertical-align: -2px; }
+.btn-small [class^="icon-"]:before,
+.btn-mini [class^="icon-"]:before  { vertical-align: -1px; }
+
+
 // Block button
 // -------------------------