Fixes #6148: Icons in mini buttons properly aligned

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d6ac78f26fb719d5e1fe043ff865c95add5720f0..0891964de21ac1b50870f902e69255f8980132e9 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3258,6 +3258,11 @@ button.close {
   margin-top: 0;
 }
 
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+  margin-top: -1px;
+}
+
 .btn-mini {
   padding: 0 6px;
   font-size: 10.5px;

diff --git a/docs/base-css.html b/docs/base-css.html
index 01df812f6a4c74932fcdb37be6583f71ca5a0e85..08de2aea07d483e7bff0e16957dacceaa77dbeb6 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -2078,23 +2078,18 @@ For example, <code><section></code> should be wrapped as inlin
 </div>
 </pre>
 
-          <h5>Large button</h5>
+          <h5>Button sizes</h5>
           <div class="bs-docs-example">
             <a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a>
+            <a class="btn btn-small" href="#"><i class="icon-star"></i> Star</a>
+            <a class="btn btn-mini" href="#"><i class="icon-star"></i> Star</a>
           </div>
 <pre class="prettyprint linenums">
 &lt;a class="btn btn-large" href="#"&gt;&lt;i class="icon-star"&gt;&lt;/i&gt; Star&lt;/a&gt;
+&lt;a class="btn btn-small" href="#"&gt;&lt;i class="icon-star"&gt;&lt;/i&gt; Star&lt;/a&gt;
+&lt;a class="btn btn-mini" href="#"&gt;&lt;i class="icon-star"&gt;&lt;/i&gt; Star&lt;/a&gt;
 </pre>
 
-          <h5>Small button</h5>
-          <div class="bs-docs-example">
-            <a class="btn btn-small" href="#"><i class="icon-star"></i></a>
-          </div>
-<pre class="prettyprint linenums">
-&lt;a class="btn btn-small" href="#"&gt;&lt;i class="icon-star"&gt;&lt;/i&gt;&lt;/a&gt;
-</pre>
-
-
           <h4>Navigation</h4>
           <div class="bs-docs-example">
             <div class="well" style="padding: 8px 0; margin-bottom: 0;">

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 9dcb7127bc4846e09bc45890354d0117c7ab46bb..6136d00952bc3faa350ebf0e1efe35255a8c3558 100644 (file)
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -2015,23 +2015,18 @@
 </div>
 </pre>
 
-          <h5>{{_i}}Large button{{/i}}</h5>
+          <h5>{{_i}}Button sizes{{/i}}</h5>
           <div class="bs-docs-example">
             <a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a>
+            <a class="btn btn-small" href="#"><i class="icon-star"></i> Star</a>
+            <a class="btn btn-mini" href="#"><i class="icon-star"></i> Star</a>
           </div>{{! /bs-docs-example }}
 <pre class="prettyprint linenums">
 &lt;a class="btn btn-large" href="#"&gt;&lt;i class="icon-star"&gt;&lt;/i&gt; Star&lt;/a&gt;
+&lt;a class="btn btn-small" href="#"&gt;&lt;i class="icon-star"&gt;&lt;/i&gt; Star&lt;/a&gt;
+&lt;a class="btn btn-mini" href="#"&gt;&lt;i class="icon-star"&gt;&lt;/i&gt; Star&lt;/a&gt;
 </pre>
 
-          <h5>{{_i}}Small button{{/i}}</h5>
-          <div class="bs-docs-example">
-            <a class="btn btn-small" href="#"><i class="icon-star"></i></a>
-          </div>{{! /bs-docs-example }}
-<pre class="prettyprint linenums">
-&lt;a class="btn btn-small" href="#"&gt;&lt;i class="icon-star"&gt;&lt;/i&gt;&lt;/a&gt;
-</pre>
-
-
           <h4>{{_i}}Navigation{{/i}}</h4>
           <div class="bs-docs-example">
             <div class="well" style="padding: 8px 0; margin-bottom: 0;">

diff --git a/less/buttons.less b/less/buttons.less
index 78371c6ff07d1cb4321c2fe61f590d691913813e..6f565b73c211ed699e16dc66ae5c1dfdf483f94d 100644 (file)
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -86,6 +86,10 @@
 .btn-small [class*=" icon-"] {
   margin-top: 0;
 }
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+  margin-top: -1px;
+}
 
 // Mini
 .btn-mini {