1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
This commit is contained in:
Mark Otto 2016-02-15 19:11:35 -08:00
parent 835d21f5a4
commit 35b9c2283b
9 changed files with 247 additions and 61 deletions

View file

@ -2309,7 +2309,8 @@ input[type="checkbox"].disabled {
.has-success.radio label,
.has-success.checkbox label,
.has-success.radio-inline label,
.has-success.checkbox-inline label {
.has-success.checkbox-inline label,
.has-success .custom-control {
color: #5cb85c;
}
@ -2340,7 +2341,8 @@ input[type="checkbox"].disabled {
.has-warning.radio label,
.has-warning.checkbox label,
.has-warning.radio-inline label,
.has-warning.checkbox-inline label {
.has-warning.checkbox-inline label,
.has-warning .custom-control {
color: #f0ad4e;
}
@ -2371,7 +2373,8 @@ input[type="checkbox"].disabled {
.has-danger.radio label,
.has-danger.checkbox label,
.has-danger.radio-inline label,
.has-danger.checkbox-inline label {
.has-danger.checkbox-inline label,
.has-danger .custom-control {
color: #d9534f;
}
@ -2768,17 +2771,32 @@ fieldset[disabled] a.btn {
border-color: #0275d8;
}
.btn-outline-primary:focus, .btn-outline-primary.focus, .btn-outline-primary:active, .btn-outline-primary.active,
.btn-outline-primary:hover {
color: #fff;
background-color: #0275d8;
border-color: #0275d8;
}
.btn-outline-primary:focus, .btn-outline-primary.focus {
color: #fff;
background-color: #0275d8;
border-color: #0275d8;
}
.btn-outline-primary:active, .btn-outline-primary.active,
.open > .btn-outline-primary.dropdown-toggle {
color: #fff;
background-color: #0275d8;
border-color: #0275d8;
}
.btn-outline-primary:hover {
.btn-outline-primary:active:hover, .btn-outline-primary:active:focus, .btn-outline-primary:active.focus, .btn-outline-primary.active:hover, .btn-outline-primary.active:focus, .btn-outline-primary.active.focus,
.open > .btn-outline-primary.dropdown-toggle:hover,
.open > .btn-outline-primary.dropdown-toggle:focus,
.open > .btn-outline-primary.dropdown-toggle.focus {
color: #fff;
background-color: #0275d8;
border-color: #0275d8;
background-color: #014682;
border-color: #01315a;
}
.btn-outline-primary.disabled:focus, .btn-outline-primary.disabled.focus, .btn-outline-primary:disabled:focus, .btn-outline-primary:disabled.focus {
@ -2796,17 +2814,32 @@ fieldset[disabled] a.btn {
border-color: #ccc;
}
.btn-outline-secondary:focus, .btn-outline-secondary.focus, .btn-outline-secondary:active, .btn-outline-secondary.active,
.btn-outline-secondary:hover {
color: #fff;
background-color: #ccc;
border-color: #ccc;
}
.btn-outline-secondary:focus, .btn-outline-secondary.focus {
color: #fff;
background-color: #ccc;
border-color: #ccc;
}
.btn-outline-secondary:active, .btn-outline-secondary.active,
.open > .btn-outline-secondary.dropdown-toggle {
color: #fff;
background-color: #ccc;
border-color: #ccc;
}
.btn-outline-secondary:hover {
.btn-outline-secondary:active:hover, .btn-outline-secondary:active:focus, .btn-outline-secondary:active.focus, .btn-outline-secondary.active:hover, .btn-outline-secondary.active:focus, .btn-outline-secondary.active.focus,
.open > .btn-outline-secondary.dropdown-toggle:hover,
.open > .btn-outline-secondary.dropdown-toggle:focus,
.open > .btn-outline-secondary.dropdown-toggle.focus {
color: #fff;
background-color: #ccc;
border-color: #ccc;
background-color: #a1a1a1;
border-color: #8c8c8c;
}
.btn-outline-secondary.disabled:focus, .btn-outline-secondary.disabled.focus, .btn-outline-secondary:disabled:focus, .btn-outline-secondary:disabled.focus {
@ -2824,17 +2857,32 @@ fieldset[disabled] a.btn {
border-color: #5bc0de;
}
.btn-outline-info:focus, .btn-outline-info.focus, .btn-outline-info:active, .btn-outline-info.active,
.btn-outline-info:hover {
color: #fff;
background-color: #5bc0de;
border-color: #5bc0de;
}
.btn-outline-info:focus, .btn-outline-info.focus {
color: #fff;
background-color: #5bc0de;
border-color: #5bc0de;
}
.btn-outline-info:active, .btn-outline-info.active,
.open > .btn-outline-info.dropdown-toggle {
color: #fff;
background-color: #5bc0de;
border-color: #5bc0de;
}
.btn-outline-info:hover {
.btn-outline-info:active:hover, .btn-outline-info:active:focus, .btn-outline-info:active.focus, .btn-outline-info.active:hover, .btn-outline-info.active:focus, .btn-outline-info.active.focus,
.open > .btn-outline-info.dropdown-toggle:hover,
.open > .btn-outline-info.dropdown-toggle:focus,
.open > .btn-outline-info.dropdown-toggle.focus {
color: #fff;
background-color: #5bc0de;
border-color: #5bc0de;
background-color: #269abc;
border-color: #1f7e9a;
}
.btn-outline-info.disabled:focus, .btn-outline-info.disabled.focus, .btn-outline-info:disabled:focus, .btn-outline-info:disabled.focus {
@ -2852,17 +2900,32 @@ fieldset[disabled] a.btn {
border-color: #5cb85c;
}
.btn-outline-success:focus, .btn-outline-success.focus, .btn-outline-success:active, .btn-outline-success.active,
.btn-outline-success:hover {
color: #fff;
background-color: #5cb85c;
border-color: #5cb85c;
}
.btn-outline-success:focus, .btn-outline-success.focus {
color: #fff;
background-color: #5cb85c;
border-color: #5cb85c;
}
.btn-outline-success:active, .btn-outline-success.active,
.open > .btn-outline-success.dropdown-toggle {
color: #fff;
background-color: #5cb85c;
border-color: #5cb85c;
}
.btn-outline-success:hover {
.btn-outline-success:active:hover, .btn-outline-success:active:focus, .btn-outline-success:active.focus, .btn-outline-success.active:hover, .btn-outline-success.active:focus, .btn-outline-success.active.focus,
.open > .btn-outline-success.dropdown-toggle:hover,
.open > .btn-outline-success.dropdown-toggle:focus,
.open > .btn-outline-success.dropdown-toggle.focus {
color: #fff;
background-color: #5cb85c;
border-color: #5cb85c;
background-color: #398439;
border-color: #2d672d;
}
.btn-outline-success.disabled:focus, .btn-outline-success.disabled.focus, .btn-outline-success:disabled:focus, .btn-outline-success:disabled.focus {
@ -2880,17 +2943,32 @@ fieldset[disabled] a.btn {
border-color: #f0ad4e;
}
.btn-outline-warning:focus, .btn-outline-warning.focus, .btn-outline-warning:active, .btn-outline-warning.active,
.btn-outline-warning:hover {
color: #fff;
background-color: #f0ad4e;
border-color: #f0ad4e;
}
.btn-outline-warning:focus, .btn-outline-warning.focus {
color: #fff;
background-color: #f0ad4e;
border-color: #f0ad4e;
}
.btn-outline-warning:active, .btn-outline-warning.active,
.open > .btn-outline-warning.dropdown-toggle {
color: #fff;
background-color: #f0ad4e;
border-color: #f0ad4e;
}
.btn-outline-warning:hover {
.btn-outline-warning:active:hover, .btn-outline-warning:active:focus, .btn-outline-warning:active.focus, .btn-outline-warning.active:hover, .btn-outline-warning.active:focus, .btn-outline-warning.active.focus,
.open > .btn-outline-warning.dropdown-toggle:hover,
.open > .btn-outline-warning.dropdown-toggle:focus,
.open > .btn-outline-warning.dropdown-toggle.focus {
color: #fff;
background-color: #f0ad4e;
border-color: #f0ad4e;
background-color: #d58512;
border-color: #b06d0f;
}
.btn-outline-warning.disabled:focus, .btn-outline-warning.disabled.focus, .btn-outline-warning:disabled:focus, .btn-outline-warning:disabled.focus {
@ -2908,17 +2986,32 @@ fieldset[disabled] a.btn {
border-color: #d9534f;
}
.btn-outline-danger:focus, .btn-outline-danger.focus, .btn-outline-danger:active, .btn-outline-danger.active,
.btn-outline-danger:hover {
color: #fff;
background-color: #d9534f;
border-color: #d9534f;
}
.btn-outline-danger:focus, .btn-outline-danger.focus {
color: #fff;
background-color: #d9534f;
border-color: #d9534f;
}
.btn-outline-danger:active, .btn-outline-danger.active,
.open > .btn-outline-danger.dropdown-toggle {
color: #fff;
background-color: #d9534f;
border-color: #d9534f;
}
.btn-outline-danger:hover {
.btn-outline-danger:active:hover, .btn-outline-danger:active:focus, .btn-outline-danger:active.focus, .btn-outline-danger.active:hover, .btn-outline-danger.active:focus, .btn-outline-danger.active.focus,
.open > .btn-outline-danger.dropdown-toggle:hover,
.open > .btn-outline-danger.dropdown-toggle:focus,
.open > .btn-outline-danger.dropdown-toggle.focus {
color: #fff;
background-color: #d9534f;
border-color: #d9534f;
background-color: #ac2925;
border-color: #8b211e;
}
.btn-outline-danger.disabled:focus, .btn-outline-danger.disabled.focus, .btn-outline-danger:disabled:focus, .btn-outline-danger:disabled.focus {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -2309,7 +2309,8 @@ input[type="checkbox"].disabled {
.has-success.radio label,
.has-success.checkbox label,
.has-success.radio-inline label,
.has-success.checkbox-inline label {
.has-success.checkbox-inline label,
.has-success .custom-control {
color: #5cb85c;
}
@ -2340,7 +2341,8 @@ input[type="checkbox"].disabled {
.has-warning.radio label,
.has-warning.checkbox label,
.has-warning.radio-inline label,
.has-warning.checkbox-inline label {
.has-warning.checkbox-inline label,
.has-warning .custom-control {
color: #f0ad4e;
}
@ -2371,7 +2373,8 @@ input[type="checkbox"].disabled {
.has-danger.radio label,
.has-danger.checkbox label,
.has-danger.radio-inline label,
.has-danger.checkbox-inline label {
.has-danger.checkbox-inline label,
.has-danger .custom-control {
color: #d9534f;
}
@ -2768,17 +2771,32 @@ fieldset[disabled] a.btn {
border-color: #0275d8;
}
.btn-outline-primary:focus, .btn-outline-primary.focus, .btn-outline-primary:active, .btn-outline-primary.active,
.btn-outline-primary:hover {
color: #fff;
background-color: #0275d8;
border-color: #0275d8;
}
.btn-outline-primary:focus, .btn-outline-primary.focus {
color: #fff;
background-color: #0275d8;
border-color: #0275d8;
}
.btn-outline-primary:active, .btn-outline-primary.active,
.open > .btn-outline-primary.dropdown-toggle {
color: #fff;
background-color: #0275d8;
border-color: #0275d8;
}
.btn-outline-primary:hover {
.btn-outline-primary:active:hover, .btn-outline-primary:active:focus, .btn-outline-primary:active.focus, .btn-outline-primary.active:hover, .btn-outline-primary.active:focus, .btn-outline-primary.active.focus,
.open > .btn-outline-primary.dropdown-toggle:hover,
.open > .btn-outline-primary.dropdown-toggle:focus,
.open > .btn-outline-primary.dropdown-toggle.focus {
color: #fff;
background-color: #0275d8;
border-color: #0275d8;
background-color: #014682;
border-color: #01315a;
}
.btn-outline-primary.disabled:focus, .btn-outline-primary.disabled.focus, .btn-outline-primary:disabled:focus, .btn-outline-primary:disabled.focus {
@ -2796,17 +2814,32 @@ fieldset[disabled] a.btn {
border-color: #ccc;
}
.btn-outline-secondary:focus, .btn-outline-secondary.focus, .btn-outline-secondary:active, .btn-outline-secondary.active,
.btn-outline-secondary:hover {
color: #fff;
background-color: #ccc;
border-color: #ccc;
}
.btn-outline-secondary:focus, .btn-outline-secondary.focus {
color: #fff;
background-color: #ccc;
border-color: #ccc;
}
.btn-outline-secondary:active, .btn-outline-secondary.active,
.open > .btn-outline-secondary.dropdown-toggle {
color: #fff;
background-color: #ccc;
border-color: #ccc;
}
.btn-outline-secondary:hover {
.btn-outline-secondary:active:hover, .btn-outline-secondary:active:focus, .btn-outline-secondary:active.focus, .btn-outline-secondary.active:hover, .btn-outline-secondary.active:focus, .btn-outline-secondary.active.focus,
.open > .btn-outline-secondary.dropdown-toggle:hover,
.open > .btn-outline-secondary.dropdown-toggle:focus,
.open > .btn-outline-secondary.dropdown-toggle.focus {
color: #fff;
background-color: #ccc;
border-color: #ccc;
background-color: #a1a1a1;
border-color: #8c8c8c;
}
.btn-outline-secondary.disabled:focus, .btn-outline-secondary.disabled.focus, .btn-outline-secondary:disabled:focus, .btn-outline-secondary:disabled.focus {
@ -2824,17 +2857,32 @@ fieldset[disabled] a.btn {
border-color: #5bc0de;
}
.btn-outline-info:focus, .btn-outline-info.focus, .btn-outline-info:active, .btn-outline-info.active,
.btn-outline-info:hover {
color: #fff;
background-color: #5bc0de;
border-color: #5bc0de;
}
.btn-outline-info:focus, .btn-outline-info.focus {
color: #fff;
background-color: #5bc0de;
border-color: #5bc0de;
}
.btn-outline-info:active, .btn-outline-info.active,
.open > .btn-outline-info.dropdown-toggle {
color: #fff;
background-color: #5bc0de;
border-color: #5bc0de;
}
.btn-outline-info:hover {
.btn-outline-info:active:hover, .btn-outline-info:active:focus, .btn-outline-info:active.focus, .btn-outline-info.active:hover, .btn-outline-info.active:focus, .btn-outline-info.active.focus,
.open > .btn-outline-info.dropdown-toggle:hover,
.open > .btn-outline-info.dropdown-toggle:focus,
.open > .btn-outline-info.dropdown-toggle.focus {
color: #fff;
background-color: #5bc0de;
border-color: #5bc0de;
background-color: #269abc;
border-color: #1f7e9a;
}
.btn-outline-info.disabled:focus, .btn-outline-info.disabled.focus, .btn-outline-info:disabled:focus, .btn-outline-info:disabled.focus {
@ -2852,17 +2900,32 @@ fieldset[disabled] a.btn {
border-color: #5cb85c;
}
.btn-outline-success:focus, .btn-outline-success.focus, .btn-outline-success:active, .btn-outline-success.active,
.btn-outline-success:hover {
color: #fff;
background-color: #5cb85c;
border-color: #5cb85c;
}
.btn-outline-success:focus, .btn-outline-success.focus {
color: #fff;
background-color: #5cb85c;
border-color: #5cb85c;
}
.btn-outline-success:active, .btn-outline-success.active,
.open > .btn-outline-success.dropdown-toggle {
color: #fff;
background-color: #5cb85c;
border-color: #5cb85c;
}
.btn-outline-success:hover {
.btn-outline-success:active:hover, .btn-outline-success:active:focus, .btn-outline-success:active.focus, .btn-outline-success.active:hover, .btn-outline-success.active:focus, .btn-outline-success.active.focus,
.open > .btn-outline-success.dropdown-toggle:hover,
.open > .btn-outline-success.dropdown-toggle:focus,
.open > .btn-outline-success.dropdown-toggle.focus {
color: #fff;
background-color: #5cb85c;
border-color: #5cb85c;
background-color: #398439;
border-color: #2d672d;
}
.btn-outline-success.disabled:focus, .btn-outline-success.disabled.focus, .btn-outline-success:disabled:focus, .btn-outline-success:disabled.focus {
@ -2880,17 +2943,32 @@ fieldset[disabled] a.btn {
border-color: #f0ad4e;
}
.btn-outline-warning:focus, .btn-outline-warning.focus, .btn-outline-warning:active, .btn-outline-warning.active,
.btn-outline-warning:hover {
color: #fff;
background-color: #f0ad4e;
border-color: #f0ad4e;
}
.btn-outline-warning:focus, .btn-outline-warning.focus {
color: #fff;
background-color: #f0ad4e;
border-color: #f0ad4e;
}
.btn-outline-warning:active, .btn-outline-warning.active,
.open > .btn-outline-warning.dropdown-toggle {
color: #fff;
background-color: #f0ad4e;
border-color: #f0ad4e;
}
.btn-outline-warning:hover {
.btn-outline-warning:active:hover, .btn-outline-warning:active:focus, .btn-outline-warning:active.focus, .btn-outline-warning.active:hover, .btn-outline-warning.active:focus, .btn-outline-warning.active.focus,
.open > .btn-outline-warning.dropdown-toggle:hover,
.open > .btn-outline-warning.dropdown-toggle:focus,
.open > .btn-outline-warning.dropdown-toggle.focus {
color: #fff;
background-color: #f0ad4e;
border-color: #f0ad4e;
background-color: #d58512;
border-color: #b06d0f;
}
.btn-outline-warning.disabled:focus, .btn-outline-warning.disabled.focus, .btn-outline-warning:disabled:focus, .btn-outline-warning:disabled.focus {
@ -2908,17 +2986,32 @@ fieldset[disabled] a.btn {
border-color: #d9534f;
}
.btn-outline-danger:focus, .btn-outline-danger.focus, .btn-outline-danger:active, .btn-outline-danger.active,
.btn-outline-danger:hover {
color: #fff;
background-color: #d9534f;
border-color: #d9534f;
}
.btn-outline-danger:focus, .btn-outline-danger.focus {
color: #fff;
background-color: #d9534f;
border-color: #d9534f;
}
.btn-outline-danger:active, .btn-outline-danger.active,
.open > .btn-outline-danger.dropdown-toggle {
color: #fff;
background-color: #d9534f;
border-color: #d9534f;
}
.btn-outline-danger:hover {
.btn-outline-danger:active:hover, .btn-outline-danger:active:focus, .btn-outline-danger:active.focus, .btn-outline-danger.active:hover, .btn-outline-danger.active:focus, .btn-outline-danger.active.focus,
.open > .btn-outline-danger.dropdown-toggle:hover,
.open > .btn-outline-danger.dropdown-toggle:focus,
.open > .btn-outline-danger.dropdown-toggle.focus {
color: #fff;
background-color: #d9534f;
border-color: #d9534f;
background-color: #ac2925;
border-color: #8b211e;
}
.btn-outline-danger.disabled:focus, .btn-outline-danger.disabled.focus, .btn-outline-danger:disabled:focus, .btn-outline-danger:disabled.focus {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long