From 61e2201c64a9a61792680c2b1d236b0a753ed182 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Thu, 16 Feb 2012 21:25:40 -0800
Subject: fix buttons focus state and swap a buttons for button buttons

---
 docs/base-css.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index d67d1bd55..7ab18108c 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1266,37 +1266,37 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
     </thead>
     <tbody>
       <tr>
-        <td><a class="btn" href="#">Default</a></td>
+        <td><button class="btn" href="#">Default</button></td>
         <td><code>.btn</code></td>
         <td>Standard gray button with gradient</td>
       </tr>
       <tr>
-        <td><a class="btn btn-primary" href="#">Primary</a></td>
+        <td><button class="btn btn-primary" href="#">Primary</button></td>
         <td><code>.btn-primary</code></td>
         <td>Provides extra visual weight and identifies the primary action in a set of buttons</td>
       </tr>
       <tr>
-        <td><a class="btn btn-info" href="#">Info</a></td>
+        <td><button class="btn btn-info" href="#">Info</button></td>
         <td><code>.btn-info</code></td>
         <td>Used as an alternate to the default styles</td>
       </tr>
       <tr>
-        <td><a class="btn btn-success" href="#">Success</a></td>
+        <td><button class="btn btn-success" href="#">Success</button></td>
         <td><code>.btn-success</code></td>
         <td>Indicates a successful or positive action</td>
       </tr>
       <tr>
-        <td><a class="btn btn-warning" href="#">Warning</a></td>
+        <td><button class="btn btn-warning" href="#">Warning</button></td>
         <td><code>.btn-warning</code></td>
         <td>Indicates caution should be taken with this action</td>
       </tr>
       <tr>
-        <td><a class="btn btn-danger" href="#">Danger</a></td>
+        <td><button class="btn btn-danger" href="#">Danger</button></td>
         <td><code>.btn-danger</code></td>
         <td>Indicates a dangerous or potentially negative action</td>
       </tr>
   	  <tr>
-        <td><a class="btn btn-inverse" href="#">Inverse</a></td>
+        <td><button class="btn btn-inverse" href="#">Inverse</button></td>
         <td><code>.btn-inverse</code></td>
         <td>Alternate dark gray button, not tied to a semantic action or use</td>
       </tr>
-- 
cgit v1.2.3


From 268e7d67abb32ed5cfc575c71f03d635672e781c Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Thu, 16 Feb 2012 21:28:16 -0800
Subject: add mini buttons per #1971

---
 docs/base-css.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 7ab18108c..c04dc7daa 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1313,7 +1313,7 @@ For example, &lt;code&gt;section&lt;/code&gt; 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>
-- 
cgit v1.2.3