From cb9234ba464d78d463a728dea2d40a0a3259d31a Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 5 Mar 2012 00:47:13 -0800
Subject: fix warning button issue per #2392 and add warning buttons to
 components

---
 docs/assets/bootstrap.zip                | Bin 54890 -> 54895 bytes
 docs/assets/css/bootstrap.css            |   1 +
 docs/components.html                     |  23 +++++++++++++++++++++++
 docs/templates/pages/components.mustache |  23 +++++++++++++++++++++++
 less/button-groups.less                  |   1 +
 5 files changed, 48 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 7ecbbc1ab..623f8dbe5 100644
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 681615867..ba796c7dc 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2222,6 +2222,7 @@ button.btn.btn-small, input[type="submit"].btn.btn-small {
   filter: alpha(opacity=100);
 }
 .btn-primary .caret,
+.btn-warning .caret,
 .btn-danger .caret,
 .btn-info .caret,
 .btn-success .caret,
diff --git a/docs/components.html b/docs/components.html
index 42de78cd6..857a28c5f 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -229,6 +229,16 @@
         </div><!-- /btn-group -->
       </div>
       <div class="btn-toolbar">
+        <div class="btn-group">
+          <a class="btn btn-warning dropdown-toggle" data-toggle="dropdown" href="#">Warning <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="#">Action</a></li>
+            <li><a href="#">Another action</a></li>
+            <li><a href="#">Something else here</a></li>
+            <li class="divider"></li>
+            <li><a href="#">Separated link</a></li>
+          </ul>
+        </div><!-- /btn-group -->
         <div class="btn-group">
           <a class="btn btn-success dropdown-toggle" data-toggle="dropdown" href="#">Success <span class="caret"></span></a>
           <ul class="dropdown-menu">
@@ -324,6 +334,17 @@
         </div><!-- /btn-group -->
       </div>
       <div class="btn-toolbar">
+        <div class="btn-group">
+          <a class="btn btn-warning" href="#">Warning</a>
+          <a class="btn btn-warning dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="#">Action</a></li>
+            <li><a href="#">Another action</a></li>
+            <li><a href="#">Something else here</a></li>
+            <li class="divider"></li>
+            <li><a href="#">Separated link</a></li>
+          </ul>
+        </div><!-- /btn-group -->
         <div class="btn-group">
           <a class="btn btn-success" href="#">Success</a>
           <a class="btn btn-success dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
@@ -346,6 +367,8 @@
             <li><a href="#">Separated link</a></li>
           </ul>
         </div><!-- /btn-group -->
+      </div>
+      <div class="btn-toolbar">
         <div class="btn-group">
           <a class="btn btn-inverse" href="#">Inverse</a>
           <a class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 332338b9e..ab7dab761 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -153,6 +153,16 @@
         </div><!-- /btn-group -->
       </div>
       <div class="btn-toolbar">
+        <div class="btn-group">
+          <a class="btn btn-warning dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Warning{{/i}} <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="#">{{_i}}Action{{/i}}</a></li>
+            <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+            <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+            <li class="divider"></li>
+            <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+          </ul>
+        </div><!-- /btn-group -->
         <div class="btn-group">
           <a class="btn btn-success dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Success{{/i}} <span class="caret"></span></a>
           <ul class="dropdown-menu">
@@ -248,6 +258,17 @@
         </div><!-- /btn-group -->
       </div>
       <div class="btn-toolbar">
+        <div class="btn-group">
+          <a class="btn btn-warning" href="#">{{_i}}Warning{{/i}}</a>
+          <a class="btn btn-warning dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="#">{{_i}}Action{{/i}}</a></li>
+            <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+            <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+            <li class="divider"></li>
+            <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+          </ul>
+        </div><!-- /btn-group -->
         <div class="btn-group">
           <a class="btn btn-success" href="#">{{_i}}Success{{/i}}</a>
           <a class="btn btn-success dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
@@ -270,6 +291,8 @@
             <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
           </ul>
         </div><!-- /btn-group -->
+      </div>
+      <div class="btn-toolbar">
         <div class="btn-group">
           <a class="btn btn-inverse" href="#">{{_i}}Inverse{{/i}}</a>
           <a class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
diff --git a/less/button-groups.less b/less/button-groups.less
index cfb25f140..ad93e3dd2 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -131,6 +131,7 @@
 
 // Account for other colors
 .btn-primary,
+.btn-warning,
 .btn-danger,
 .btn-info,
 .btn-success,
-- 
cgit v1.2.3