diff options
| author | Mark Otto <[email protected]> | 2012-02-19 16:00:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-19 16:00:54 -0800 |
| commit | f4f34ab12f0f89e6a11f6b752ab82fb01bd746d4 (patch) | |
| tree | 1fd89eb7715f4acff7e48a077fcd5413e39f0079 /docs/assets/css/bootstrap.css | |
| parent | 59d570fc160c71dc21f77735e9d14797e247d859 (diff) | |
| parent | 1e6d386b8df2d7235b23a96ddd0489c1ab2650dc (diff) | |
| download | bootstrap-f4f34ab12f0f89e6a11f6b752ab82fb01bd746d4.tar.xz bootstrap-f4f34ab12f0f89e6a11f6b752ab82fb01bd746d4.zip | |
Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/assets/css/bootstrap.css')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 65aaa7c85..25a9f2fef 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1962,16 +1962,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); } @@ -1980,10 +1980,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; @@ -3190,6 +3190,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; |
