aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-05 00:47:13 -0800
committerMark Otto <[email protected]>2012-03-05 00:47:13 -0800
commitcb9234ba464d78d463a728dea2d40a0a3259d31a (patch)
tree869107d2a7f02304312f2fbca2863428594fef73 /docs
parent7a8d6b19767a92b1c4ea45d88d4eedc2b29bf1fa (diff)
downloadbootstrap-cb9234ba464d78d463a728dea2d40a0a3259d31a.tar.xz
bootstrap-cb9234ba464d78d463a728dea2d40a0a3259d31a.zip
fix warning button issue per #2392 and add warning buttons to components
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin54890 -> 54895 bytes
-rw-r--r--docs/assets/css/bootstrap.css1
-rw-r--r--docs/components.html23
-rw-r--r--docs/templates/pages/components.mustache23
4 files changed, 47 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 7ecbbc1ab..623f8dbe5 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files 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
@@ -230,6 +230,16 @@
</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">
<li><a href="#">Action</a></li>
@@ -325,6 +335,17 @@
</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>
<ul class="dropdown-menu">
@@ -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
@@ -154,6 +154,16 @@
</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">
<li><a href="#">{{_i}}Action{{/i}}</a></li>
@@ -249,6 +259,17 @@
</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>
<ul class="dropdown-menu">
@@ -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>