From 60826077e7384e548c44c26531e7ae94e12fbcf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstr=C3=B6m?= Date: Mon, 13 Feb 2012 09:41:28 +0100 Subject: Clean up inverse button using variables, adding button group examples. Also adding inverse inline label --- docs/assets/bootstrap.zip | Bin 53155 -> 53123 bytes docs/assets/css/bootstrap.css | 30 ++++++++++++++++++------------ docs/components.html | 29 +++++++++++++++++++++++++++++ docs/templates/pages/components.mustache | 29 +++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 12 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index b38db2772..4a9a9eba5 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 e52d2f0cf..25c04944a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1806,7 +1806,7 @@ table .span12 { .btn-danger.active, .btn-success.active, .btn-info.active, -.btn-dark.active { +.btn-inverse.active { color: rgba(255, 255, 255, 0.75); } .btn-primary { @@ -1930,16 +1930,16 @@ table .span12 { background-color: #24748c \9; } .btn-inverse { - background-color: #393939; - background-image: -moz-linear-gradient(top, #454545, #262626); - background-image: -ms-linear-gradient(top, #454545, #262626); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#454545), to(#262626)); - background-image: -webkit-linear-gradient(top, #454545, #262626); - background-image: -o-linear-gradient(top, #454545, #262626); - background-image: linear-gradient(top, #454545, #262626); + background-color: #414141; + background-image: -moz-linear-gradient(top, #555555, #222222); + background-image: -ms-linear-gradient(top, #555555, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); + background-image: -webkit-linear-gradient(top, #555555, #222222); + background-image: -o-linear-gradient(top, #555555, #222222); + background-image: linear-gradient(top, #555555, #222222); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545', endColorstr='#262626', GradientType=0); - border-color: #262626 #262626 #000000; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); + border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } @@ -1948,10 +1948,10 @@ table .span12 { .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { - background-color: #262626; + background-color: #222222; } .btn-inverse:active, .btn-inverse.active { - background-color: #0c0c0c \9; + background-color: #080808 \9; } button.btn, input[type="submit"].btn { *padding-top: 2px; @@ -3172,6 +3172,12 @@ a.thumbnail:hover { .label-info:hover { background-color: #2d6987; } +.label-inverse { + background-color: #333333; +} +.label-inverse:hover { + background-color: #1a1a1a; +} @-webkit-keyframes progress-bar-stripes { from { background-position: 0 0; diff --git a/docs/components.html b/docs/components.html index d0b5de632..bab4f9764 100644 --- a/docs/components.html +++ b/docs/components.html @@ -248,6 +248,16 @@
  • Separated link
    • +
    + Inverse + +

    Heads up! Button dropdowns require the Bootstrap dropdown plugin to function.

    @@ -331,6 +341,17 @@
  • Separated link
    • +
    + Inverse + + +
    @@ -1136,6 +1157,14 @@ <span class="label label-info">Info</span> + + + Inverse + + + <span class="label label-inverse">Inverse</span> + + diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 0b55e60f0..8649a9c28 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -172,6 +172,16 @@
  • {{_i}}Separated link{{/i}}
    • +
    + {{_i}}Inverse{{/i}} + +

    {{_i}}Heads up!{{/i}} {{_i}}Button dropdowns require the Bootstrap dropdown plugin to function.{{/i}}

    @@ -255,6 +265,17 @@
  • {{_i}}Separated link{{/i}}
    • +
    + {{_i}}Inverse{{/i}} + + +
    @@ -1060,6 +1081,14 @@ <span class="label label-info">{{_i}}Info{{/i}}</span> + + + {{_i}}Inverse{{/i}} + + + <span class="label label-inverse">{{_i}}Inverse{{/i}}</span> + + -- cgit v1.2.3