Fixes #5963: Add large button example to icons, fix vertical alignment in large buttons

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index f2cd3d3e9807907ee94099ffc2987e9bddc2b1e7..ed58d7aafac8b7a3ca35230de57c954460a902bd 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3238,7 +3238,7 @@ button.close {
 
 .btn-large [class^="icon-"],
 .btn-large [class*=" icon-"] {
-  margin-top: 2px;
+  margin-top: 4px;
 }
 
 .btn-small {

diff --git a/docs/base-css.html b/docs/base-css.html
index fee6fc8970df8b088493c6d5455f62ee8a3ab4d0..69229231f609aed900a24df478c68f723a8a7886 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -2076,6 +2076,14 @@ For example, <code><section></code> should be wrapped as inlin
     <li><a href="#"><i class="i"></i> Make admin</a></li>
   </ul>
 </div>
+</pre>
+
+          <h5>Large button</h5>
+          <div class="bs-docs-example">
+            <a class="btn btn-large" 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;
 </pre>
 
           <h5>Small button</h5>

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 29c4cebb1e18256f8b96e6b831842cbb4b835a28..17f446b3d88032449a42ba6985a1b011dd0cb3f4 100644 (file)
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -2013,6 +2013,14 @@
     <li><a href="#"><i class="i"></i> {{_i}}Make admin{{/i}}</a></li>
   </ul>
 </div>
+</pre>
+
+          <h5>{{_i}}Large button{{/i}}</h5>
+          <div class="bs-docs-example">
+            <a class="btn btn-large" 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;
 </pre>
 
           <h5>{{_i}}Small button{{/i}}</h5>

diff --git a/less/buttons.less b/less/buttons.less
index e0afbed96be7136ae538bc0bef7e1fa713757a62..78371c6ff07d1cb4321c2fe61f590d691913813e 100644 (file)
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -73,7 +73,7 @@
 }
 .btn-large [class^="icon-"],
 .btn-large [class*=" icon-"] {
-  margin-top: 2px;
+  margin-top: 4px;
 }
 
 // Small