add mini buttons per #1971

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 71552e7f80c7166249aa278e0293710f224cf2f7..5d59b6d7f64693f25011887bd18cd20b8757a169 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e16383b1cc3717a120e72f9fb0b9367db6df80e3..d6441d13356dbb6397a24e66a8d72df90c29e07e 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1791,6 +1791,11 @@ table .span12 {
 .btn-small [class^="icon-"] {
   margin-top: -1px;
 }
+.btn-mini {
+  padding: 2px 6px;
+  font-size: 11px;
+  line-height: 14px;
+}
 .btn-primary,
 .btn-primary:hover,
 .btn-warning,

diff --git a/docs/base-css.html b/docs/base-css.html
index 7ab18108c1299d9666ee2a99ec3ee99fd1d458c4..c04dc7daa9a2f2b8d9e823fb151dea627da893fb 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1313,7 +1313,7 @@ For example, <code>section</code> should be wrapped as inline.
     </div>
     <div class="span4">
       <h3>Multiple sizes</h3>
-      <p>Fancy larger or smaller buttons? Add <code>.btn-large</code> or <code>.btn-small</code> for two additional sizes.</p>
+      <p>Fancy larger or smaller buttons? Add <code>.btn-large</code>, <code>.btn-small</code>, or <code>.btn-mini</code> for two additional sizes.</p>
       <p>
         <button class="btn btn-large btn-primary">Primary action</button>
         <button class="btn btn-large">Action</button>
@@ -1322,6 +1322,10 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
         <button class="btn btn-small btn-primary">Primary action</button>
         <button class="btn btn-small">Action</button>
       </p>
+      <p>
+        <button class="btn btn-mini btn-primary">Primary action</button>
+        <button class="btn btn-mini">Action</button>
+      </p>
       <br>
       <h3>Disabled state</h3>
       <p>For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code>&lt;button&gt;</code> elements.</p>

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index f3d18ffd0263f27479fb4ab51a7458cac93dc1c3..acb9cdcb2dd3c241d54f1fd2520392cadb7c34a1 100644 (file)
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1237,7 +1237,7 @@
     </div>
     <div class="span4">
       <h3>{{_i}}Multiple sizes{{/i}}</h3>
-      <p>{{_i}}Fancy larger or smaller buttons? Add <code>.btn-large</code> or <code>.btn-small</code> for two additional sizes.{{/i}}</p>
+      <p>{{_i}}Fancy larger or smaller buttons? Add <code>.btn-large</code>, <code>.btn-small</code>, or <code>.btn-mini</code> for two additional sizes.{{/i}}</p>
       <p>
         <button class="btn btn-large btn-primary">{{_i}}Primary action{{/i}}</button>
         <button class="btn btn-large">{{_i}}Action{{/i}}</button>
@@ -1246,6 +1246,10 @@
         <button class="btn btn-small btn-primary">{{_i}}Primary action{{/i}}</button>
         <button class="btn btn-small">{{_i}}Action{{/i}}</button>
       </p>
+      <p>
+        <button class="btn btn-mini btn-primary">{{_i}}Primary action{{/i}}</button>
+        <button class="btn btn-mini">{{_i}}Action{{/i}}</button>
+      </p>
       <br>
       <h3>{{_i}}Disabled state{{/i}}</h3>
       <p>{{_i}}For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code>&lt;button&gt;</code> elements.{{/i}}</p>

diff --git a/less/buttons.less b/less/buttons.less
index 292e046267ad077a55f3e31f57a5556d9635f8a7..55e9fbf1c1367cfa4b0483832cf2ce5680364426 100644 (file)
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -92,6 +92,13 @@
   margin-top: -1px;
 }
 
+// Mini
+.btn-mini {
+  padding: 2px 6px;
+  font-size: @baseFontSize - 2px;
+  line-height: @baseLineHeight - 4px;
+}
+
 
 // Alternate buttons
 // --------------------------------------------------