diff options
| author | Mark Otto <[email protected]> | 2014-03-07 00:23:52 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-07 00:23:52 -0800 |
| commit | c03b8f1f0ff090a1aef53704cbb2526bdbbfafbf (patch) | |
| tree | 1a9d45a79516db97d6db46c2ab172bb2f59f26c7 /dist/css/bootstrap.css | |
| parent | cb7eb674accd24b6b73f26ef23cf4a301b6ebfaf (diff) | |
| parent | 6452b409aaaf837ba009cffb341cb287c315fe74 (diff) | |
| download | bootstrap-c03b8f1f0ff090a1aef53704cbb2526bdbbfafbf.tar.xz bootstrap-c03b8f1f0ff090a1aef53704cbb2526bdbbfafbf.zip | |
Merge branch 'master' into pr/12670
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e739f2300..3a1098139 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2683,7 +2683,7 @@ fieldset[disabled] .btn { .btn-default.active, .open .dropdown-toggle.btn-default { color: #333; - background-color: #ebebeb; + background-color: #e6e6e6; border-color: #adadad; } .btn-default:active, @@ -2724,7 +2724,7 @@ fieldset[disabled] .btn-default.active { .btn-primary.active, .open .dropdown-toggle.btn-primary { color: #fff; - background-color: #3276b1; + background-color: #3071a9; border-color: #285e8e; } .btn-primary:active, @@ -2765,7 +2765,7 @@ fieldset[disabled] .btn-primary.active { .btn-success.active, .open .dropdown-toggle.btn-success { color: #fff; - background-color: #47a447; + background-color: #449d44; border-color: #398439; } .btn-success:active, @@ -2806,7 +2806,7 @@ fieldset[disabled] .btn-success.active { .btn-info.active, .open .dropdown-toggle.btn-info { color: #fff; - background-color: #39b3d7; + background-color: #31b0d5; border-color: #269abc; } .btn-info:active, @@ -2847,7 +2847,7 @@ fieldset[disabled] .btn-info.active { .btn-warning.active, .open .dropdown-toggle.btn-warning { color: #fff; - background-color: #ed9c28; + background-color: #ec971f; border-color: #d58512; } .btn-warning:active, @@ -2888,7 +2888,7 @@ fieldset[disabled] .btn-warning.active { .btn-danger.active, .open .dropdown-toggle.btn-danger { color: #fff; - background-color: #d2322d; + background-color: #c9302c; border-color: #ac2925; } .btn-danger:active, @@ -3316,7 +3316,9 @@ tbody.collapse.in { } [data-toggle="buttons"] > .btn > input[type="radio"], [data-toggle="buttons"] > .btn > input[type="checkbox"] { - display: none; + position: absolute; + z-index: -1; + opacity: 0; } .input-group { position: relative; @@ -4722,6 +4724,7 @@ a.list-group-item .list-group-item-heading { } a.list-group-item:hover, a.list-group-item:focus { + color: #555; text-decoration: none; background-color: #f5f5f5; } |
