Commit 164b41b2 authored by Mark Otto's avatar Mark Otto
Browse files

Fixes #12937: Darken active button states just a smidge more

parent e180258b
Showing with 23 additions and 19 deletions
+23 -19
...@@ -3437,7 +3437,7 @@ fieldset[disabled] .btn { ...@@ -3437,7 +3437,7 @@ fieldset[disabled] .btn {
.btn-default.active, .btn-default.active,
.open .dropdown-toggle.btn-default { .open .dropdown-toggle.btn-default {
color: #333; color: #333;
background-color: #ebebeb; background-color: #e6e6e6;
border-color: #adadad; border-color: #adadad;
} }
...@@ -3483,7 +3483,7 @@ fieldset[disabled] .btn-default.active { ...@@ -3483,7 +3483,7 @@ fieldset[disabled] .btn-default.active {
.btn-primary.active, .btn-primary.active,
.open .dropdown-toggle.btn-primary { .open .dropdown-toggle.btn-primary {
color: #fff; color: #fff;
background-color: #3276b1; background-color: #3071a9;
border-color: #285e8e; border-color: #285e8e;
} }
...@@ -3529,7 +3529,7 @@ fieldset[disabled] .btn-primary.active { ...@@ -3529,7 +3529,7 @@ fieldset[disabled] .btn-primary.active {
.btn-success.active, .btn-success.active,
.open .dropdown-toggle.btn-success { .open .dropdown-toggle.btn-success {
color: #fff; color: #fff;
background-color: #47a447; background-color: #449d44;
border-color: #398439; border-color: #398439;
} }
...@@ -3575,7 +3575,7 @@ fieldset[disabled] .btn-success.active { ...@@ -3575,7 +3575,7 @@ fieldset[disabled] .btn-success.active {
.btn-info.active, .btn-info.active,
.open .dropdown-toggle.btn-info { .open .dropdown-toggle.btn-info {
color: #fff; color: #fff;
background-color: #39b3d7; background-color: #31b0d5;
border-color: #269abc; border-color: #269abc;
} }
...@@ -3621,7 +3621,7 @@ fieldset[disabled] .btn-info.active { ...@@ -3621,7 +3621,7 @@ fieldset[disabled] .btn-info.active {
.btn-warning.active, .btn-warning.active,
.open .dropdown-toggle.btn-warning { .open .dropdown-toggle.btn-warning {
color: #fff; color: #fff;
background-color: #ed9c28; background-color: #ec971f;
border-color: #d58512; border-color: #d58512;
} }
...@@ -3667,7 +3667,7 @@ fieldset[disabled] .btn-warning.active { ...@@ -3667,7 +3667,7 @@ fieldset[disabled] .btn-warning.active {
.btn-danger.active, .btn-danger.active,
.open .dropdown-toggle.btn-danger { .open .dropdown-toggle.btn-danger {
color: #fff; color: #fff;
background-color: #d2322d; background-color: #c9302c;
border-color: #ac2925; border-color: #ac2925;
} }
...@@ -4172,7 +4172,9 @@ tbody.collapse.in { ...@@ -4172,7 +4172,9 @@ tbody.collapse.in {
[data-toggle="buttons"] > .btn > input[type="radio"], [data-toggle="buttons"] > .btn > input[type="radio"],
[data-toggle="buttons"] > .btn > input[type="checkbox"] { [data-toggle="buttons"] > .btn > input[type="checkbox"] {
display: none; position: absolute;
z-index: -1;
opacity: 0;
} }
.input-group { .input-group {
......
This diff is collapsed.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
...@@ -2676,7 +2676,7 @@ fieldset[disabled] .btn { ...@@ -2676,7 +2676,7 @@ fieldset[disabled] .btn {
.btn-default.active, .btn-default.active,
.open .dropdown-toggle.btn-default { .open .dropdown-toggle.btn-default {
color: #333; color: #333;
background-color: #ebebeb; background-color: #e6e6e6;
border-color: #adadad; border-color: #adadad;
} }
.btn-default:active, .btn-default:active,
...@@ -2717,7 +2717,7 @@ fieldset[disabled] .btn-default.active { ...@@ -2717,7 +2717,7 @@ fieldset[disabled] .btn-default.active {
.btn-primary.active, .btn-primary.active,
.open .dropdown-toggle.btn-primary { .open .dropdown-toggle.btn-primary {
color: #fff; color: #fff;
background-color: #3276b1; background-color: #3071a9;
border-color: #285e8e; border-color: #285e8e;
} }
.btn-primary:active, .btn-primary:active,
...@@ -2758,7 +2758,7 @@ fieldset[disabled] .btn-primary.active { ...@@ -2758,7 +2758,7 @@ fieldset[disabled] .btn-primary.active {
.btn-success.active, .btn-success.active,
.open .dropdown-toggle.btn-success { .open .dropdown-toggle.btn-success {
color: #fff; color: #fff;
background-color: #47a447; background-color: #449d44;
border-color: #398439; border-color: #398439;
} }
.btn-success:active, .btn-success:active,
...@@ -2799,7 +2799,7 @@ fieldset[disabled] .btn-success.active { ...@@ -2799,7 +2799,7 @@ fieldset[disabled] .btn-success.active {
.btn-info.active, .btn-info.active,
.open .dropdown-toggle.btn-info { .open .dropdown-toggle.btn-info {
color: #fff; color: #fff;
background-color: #39b3d7; background-color: #31b0d5;
border-color: #269abc; border-color: #269abc;
} }
.btn-info:active, .btn-info:active,
...@@ -2840,7 +2840,7 @@ fieldset[disabled] .btn-info.active { ...@@ -2840,7 +2840,7 @@ fieldset[disabled] .btn-info.active {
.btn-warning.active, .btn-warning.active,
.open .dropdown-toggle.btn-warning { .open .dropdown-toggle.btn-warning {
color: #fff; color: #fff;
background-color: #ed9c28; background-color: #ec971f;
border-color: #d58512; border-color: #d58512;
} }
.btn-warning:active, .btn-warning:active,
...@@ -2881,7 +2881,7 @@ fieldset[disabled] .btn-warning.active { ...@@ -2881,7 +2881,7 @@ fieldset[disabled] .btn-warning.active {
.btn-danger.active, .btn-danger.active,
.open .dropdown-toggle.btn-danger { .open .dropdown-toggle.btn-danger {
color: #fff; color: #fff;
background-color: #d2322d; background-color: #c9302c;
border-color: #ac2925; border-color: #ac2925;
} }
.btn-danger:active, .btn-danger:active,
...@@ -3306,7 +3306,9 @@ tbody.collapse.in { ...@@ -3306,7 +3306,9 @@ tbody.collapse.in {
} }
[data-toggle="buttons"] > .btn > input[type="radio"], [data-toggle="buttons"] > .btn > input[type="radio"],
[data-toggle="buttons"] > .btn > input[type="checkbox"] { [data-toggle="buttons"] > .btn > input[type="checkbox"] {
display: none; position: absolute;
z-index: -1;
opacity: 0;
} }
.input-group { .input-group {
position: relative; position: relative;
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
This diff is collapsed.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
&.active, &.active,
.open .dropdown-toggle& { .open .dropdown-toggle& {
color: @color; color: @color;
background-color: darken(@background, 8%); background-color: darken(@background, 10%);
border-color: darken(@border, 12%); border-color: darken(@border, 12%);
} }
&:active, &:active,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment