From: Mark Otto <otto@github.com>
Date: Tue, 26 Feb 2013 08:44:15 +0000 (-0800)
Subject: nuke glyphicons changes in buttons for now because it's whack
X-Git-Tag: v3.0.0-rc1~626
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2e5580c0ebbc333590a685693dcaa6d97ef18e7;p=thirdparty%2Fbootstrap.git

nuke glyphicons changes in buttons for now because it's whack
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index cdcd0f9368..19be8cfaa7 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1690,26 +1690,12 @@ fieldset[disabled] .btn {
   border-radius: 3px;
 }
 
-.btn-mini [class^="icon-"],
-.btn-mini [class*=" icon-"] {
-  margin-top: -1px;
-}
-
 .btn-mini {
   padding: 0 6px;
   font-size: 10.5px;
   border-radius: 3px;
 }
 
-.btn [class^="glyphicon-"]::before {
-  vertical-align: -2px;
-}
-
-.btn-small [class^="glyphicon-"]::before,
-.btn-mini [class^="glyphicon-"]::before {
-  vertical-align: -1px;
-}
-
 .btn-block {
   display: block;
   width: 100%;
diff --git a/less/buttons.less b/less/buttons.less
index 4b278383fa..3d71272121 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -64,10 +64,6 @@
   font-size: @font-size-small;
   border-radius: @border-radius-small;
 }
-.btn-mini [class^="icon-"],
-.btn-mini [class*=" icon-"] {
-  margin-top: -1px;
-}
 
 // Mini
 .btn-mini {
@@ -80,10 +76,7 @@
 // Icons in buttons
 // -------------------------
 
-.btn [class^="glyphicon-"]::before       { vertical-align: -2px; }
-.btn-small [class^="glyphicon-"]::before,
-.btn-mini [class^="glyphicon-"]::before  { vertical-align: -1px; }
-
+// TODO: figure this shit out
 
 // Block button
 // -------------------------