Commit c03b8f1f authored by Mark Otto's avatar Mark Otto

Merge branch 'master' into pr/12670

parents cb7eb674 6452b409
...@@ -3444,7 +3444,7 @@ fieldset[disabled] .btn { ...@@ -3444,7 +3444,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;
} }
...@@ -3490,7 +3490,7 @@ fieldset[disabled] .btn-default.active { ...@@ -3490,7 +3490,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;
} }
...@@ -3536,7 +3536,7 @@ fieldset[disabled] .btn-primary.active { ...@@ -3536,7 +3536,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;
} }
...@@ -3582,7 +3582,7 @@ fieldset[disabled] .btn-success.active { ...@@ -3582,7 +3582,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;
} }
...@@ -3628,7 +3628,7 @@ fieldset[disabled] .btn-info.active { ...@@ -3628,7 +3628,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;
} }
...@@ -3674,7 +3674,7 @@ fieldset[disabled] .btn-warning.active { ...@@ -3674,7 +3674,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;
} }
...@@ -4182,7 +4182,9 @@ tbody.collapse.in { ...@@ -4182,7 +4182,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 {
...@@ -5877,6 +5879,7 @@ a.list-group-item .list-group-item-heading { ...@@ -5877,6 +5879,7 @@ a.list-group-item .list-group-item-heading {
a.list-group-item:hover, a.list-group-item:hover,
a.list-group-item:focus { a.list-group-item:focus {
color: #555;
text-decoration: none; text-decoration: none;
background-color: #f5f5f5; background-color: #f5f5f5;
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff was suppressed by a .gitattributes entry.
...@@ -2683,7 +2683,7 @@ fieldset[disabled] .btn { ...@@ -2683,7 +2683,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,
...@@ -2724,7 +2724,7 @@ fieldset[disabled] .btn-default.active { ...@@ -2724,7 +2724,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,
...@@ -2765,7 +2765,7 @@ fieldset[disabled] .btn-primary.active { ...@@ -2765,7 +2765,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,
...@@ -2806,7 +2806,7 @@ fieldset[disabled] .btn-success.active { ...@@ -2806,7 +2806,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,
...@@ -2847,7 +2847,7 @@ fieldset[disabled] .btn-info.active { ...@@ -2847,7 +2847,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,
...@@ -2888,7 +2888,7 @@ fieldset[disabled] .btn-warning.active { ...@@ -2888,7 +2888,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,
...@@ -3316,7 +3316,9 @@ tbody.collapse.in { ...@@ -3316,7 +3316,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;
...@@ -4722,6 +4724,7 @@ a.list-group-item .list-group-item-heading { ...@@ -4722,6 +4724,7 @@ a.list-group-item .list-group-item-heading {
} }
a.list-group-item:hover, a.list-group-item:hover,
a.list-group-item:focus { a.list-group-item:focus {
color: #555;
text-decoration: none; text-decoration: none;
background-color: #f5f5f5; background-color: #f5f5f5;
} }
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -1352,6 +1352,10 @@ ...@@ -1352,6 +1352,10 @@
<label for="input-@list-group-link-color">@list-group-link-color</label> <label for="input-@list-group-link-color">@list-group-link-color</label>
<input id="input-@list-group-link-color" type="text" value="#555" data-var="@list-group-link-color" class="form-control"/> <input id="input-@list-group-link-color" type="text" value="#555" data-var="@list-group-link-color" class="form-control"/>
</div> </div>
<div class="bs-customizer-input">
<label for="input-@list-group-link-hover-color">@list-group-link-hover-color</label>
<input id="input-@list-group-link-hover-color" type="text" value="@list-group-link-color" data-var="@list-group-link-hover-color" class="form-control"/>
</div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@list-group-link-heading-color">@list-group-link-heading-color</label> <label for="input-@list-group-link-heading-color">@list-group-link-heading-color</label>
<input id="input-@list-group-link-heading-color" type="text" value="#333" data-var="@list-group-link-heading-color" class="form-control"/> <input id="input-@list-group-link-heading-color" type="text" value="#333" data-var="@list-group-link-heading-color" class="form-control"/>
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -220,7 +220,17 @@ ...@@ -220,7 +220,17 @@
// Checkbox and radio options // Checkbox and radio options
//
// In order to support the browser's form validation feedback, powered by the
// `required` attribute, we have to "hide" the inputs via `opacity`. We cannot
// use `display: none;` or `visibility: hidden;` as that also hides the popover.
// This way, we ensure a DOM element is visible to position the popover from.
//
// See https://github.com/twbs/bootstrap/pull/12794 for more.
[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;
} }
...@@ -62,6 +62,7 @@ a.list-group-item { ...@@ -62,6 +62,7 @@ a.list-group-item {
&:hover, &:hover,
&:focus { &:focus {
text-decoration: none; text-decoration: none;
color: @list-group-link-hover-color;
background-color: @list-group-hover-bg; background-color: @list-group-hover-bg;
} }
} }
......
...@@ -602,7 +602,7 @@ ...@@ -602,7 +602,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,
......
...@@ -662,6 +662,7 @@ ...@@ -662,6 +662,7 @@
@list-group-disabled-text-color: @list-group-disabled-color; @list-group-disabled-text-color: @list-group-disabled-color;
@list-group-link-color: #555; @list-group-link-color: #555;
@list-group-link-hover-color: @list-group-link-color;
@list-group-link-heading-color: #333; @list-group-link-heading-color: #333;
......
This diff is collapsed.
Markdown is supported
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