diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 7ecbbc1ab20a2571946ac7611f7f5a82693595f5..623f8dbe544f68910c88ad45336dccc22f49580f 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 681615867849af9415f3046f39c43493377c76c5..ba796c7dc45e556f3f6d1eeb05b5f462910a5309 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 42de78cd64473a08356a6d95b91b322f766f36c0..857a28c5fca1145dde20f1e05f264793e02332a3 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 332338b9eaf303719f3b150fecbc38fa1451a67e..ab7dab761efb273845702c720f5bd4cc00aecf75 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 cfb25f1409eb6d66d4c3161471db0a240046bac8..ad93e3dd243a24b94712b747d1faf04629cad8fb 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,