0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00
This commit is contained in:
Mark Otto 2017-12-22 16:22:52 -08:00
parent e3aaadc5c9
commit e49871489b
6 changed files with 74 additions and 84 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2020,31 +2020,37 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.form-check {
position: relative;
display: block;
margin-bottom: 0.5rem;
}
.form-check.disabled .form-check-label {
color: #868e96;
}
.form-check-label {
padding-left: 1.25rem;
margin-bottom: 0;
}
.form-check-input {
position: absolute;
margin-top: 0.25rem;
margin-top: 0.3rem;
margin-left: -1.25rem;
}
.form-check-input:disabled ~ .form-check-label {
color: #868e96;
}
.form-check-label {
margin-bottom: 0;
}
.form-check-inline {
display: inline-block;
display: -ms-inline-flexbox;
display: inline-flex;
-ms-flex-align: center;
align-items: center;
padding-left: 0;
margin-right: 0.75rem;
}
.form-check-inline .form-check-label {
vertical-align: middle;
.form-check-inline .form-check-input {
position: static;
margin-top: 0;
margin-right: 0.3125rem;
margin-left: 0;
}
.valid-feedback {
@ -2094,23 +2100,23 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
display: block;
}
.was-validated .form-check-input:valid + .form-check-label, .form-check-input.is-valid + .form-check-label {
.was-validated .form-check-input:valid ~ .form-check-label, .form-check-input.is-valid ~ .form-check-label {
color: #28a745;
}
.was-validated .custom-control-input:valid ~ .custom-control-indicator, .custom-control-input.is-valid ~ .custom-control-indicator {
.was-validated .custom-control-input:valid ~ .custom-control-label, .custom-control-input.is-valid ~ .custom-control-label {
color: #28a745;
}
.was-validated .custom-control-input:valid ~ .custom-control-label::before, .custom-control-input.is-valid ~ .custom-control-label::before {
background-color: #71dd8a;
}
.was-validated .custom-control-input:valid ~ .custom-control-description, .custom-control-input.is-valid ~ .custom-control-description {
color: #28a745;
}
.was-validated .custom-control-input:valid:checked ~ .custom-control-indicator, .custom-control-input.is-valid:checked ~ .custom-control-indicator {
.was-validated .custom-control-input:valid:checked ~ .custom-control-label::before, .custom-control-input.is-valid:checked ~ .custom-control-label::before {
background-color: #34ce57;
}
.was-validated .custom-control-input:valid:focus ~ .custom-control-indicator, .custom-control-input.is-valid:focus ~ .custom-control-indicator {
.was-validated .custom-control-input:valid:focus ~ .custom-control-label::before, .custom-control-input.is-valid:focus ~ .custom-control-label::before {
box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
}
@ -2173,23 +2179,23 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
display: block;
}
.was-validated .form-check-input:invalid + .form-check-label, .form-check-input.is-invalid + .form-check-label {
.was-validated .form-check-input:invalid ~ .form-check-label, .form-check-input.is-invalid ~ .form-check-label {
color: #dc3545;
}
.was-validated .custom-control-input:invalid ~ .custom-control-indicator, .custom-control-input.is-invalid ~ .custom-control-indicator {
.was-validated .custom-control-input:invalid ~ .custom-control-label, .custom-control-input.is-invalid ~ .custom-control-label {
color: #dc3545;
}
.was-validated .custom-control-input:invalid ~ .custom-control-label::before, .custom-control-input.is-invalid ~ .custom-control-label::before {
background-color: #efa2a9;
}
.was-validated .custom-control-input:invalid ~ .custom-control-description, .custom-control-input.is-invalid ~ .custom-control-description {
color: #dc3545;
}
.was-validated .custom-control-input:invalid:checked ~ .custom-control-indicator, .custom-control-input.is-invalid:checked ~ .custom-control-indicator {
.was-validated .custom-control-input:invalid:checked ~ .custom-control-label::before, .custom-control-input.is-invalid:checked ~ .custom-control-label::before {
background-color: #e4606d;
}
.was-validated .custom-control-input:invalid:focus ~ .custom-control-indicator, .custom-control-input.is-invalid:focus ~ .custom-control-indicator {
.was-validated .custom-control-input:invalid:focus ~ .custom-control-label::before, .custom-control-input.is-invalid:focus ~ .custom-control-label::before {
box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
}
@ -2258,10 +2264,6 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
-ms-flex-pack: center;
justify-content: center;
width: auto;
margin-top: 0;
margin-bottom: 0;
}
.form-inline .form-check-label {
padding-left: 0;
}
.form-inline .form-check-input {
@ -2271,22 +2273,13 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
margin-left: 0;
}
.form-inline .custom-control {
display: -ms-flexbox;
display: flex;
-ms-flex-align: center;
align-items: center;
-ms-flex-pack: center;
justify-content: center;
padding-left: 0;
}
.form-inline .custom-control-indicator {
position: static;
display: inline-block;
margin-right: 0.25rem;
vertical-align: text-bottom;
}
.form-inline .has-feedback .form-control-feedback {
top: 0;
.form-inline .custom-control-label {
margin-bottom: 0;
}
}
@ -3382,10 +3375,14 @@ tbody.collapse.show {
.custom-control {
position: relative;
display: -ms-inline-flexbox;
display: inline-flex;
display: block;
min-height: 1.5rem;
padding-left: 1.5rem;
}
.custom-control-inline {
display: -ms-inline-flexbox;
display: inline-flex;
margin-right: 1rem;
}
@ -3395,29 +3392,33 @@ tbody.collapse.show {
opacity: 0;
}
.custom-control-input:checked ~ .custom-control-indicator {
.custom-control-input:checked ~ .custom-control-label::before {
color: #fff;
background-color: #007bff;
}
.custom-control-input:focus ~ .custom-control-indicator {
.custom-control-input:focus ~ .custom-control-label::before {
box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
}
.custom-control-input:active ~ .custom-control-indicator {
.custom-control-input:active ~ .custom-control-label::before {
color: #fff;
background-color: #b3d7ff;
}
.custom-control-input:disabled ~ .custom-control-indicator {
background-color: #e9ecef;
}
.custom-control-input:disabled ~ .custom-control-description {
.custom-control-input:disabled ~ .custom-control-label {
color: #868e96;
}
.custom-control-indicator {
.custom-control-input:disabled ~ .custom-control-label::before {
background-color: #e9ecef;
}
.custom-control-label {
margin-bottom: 0;
}
.custom-control-label::before {
position: absolute;
top: 0.25rem;
left: 0;
@ -3425,6 +3426,7 @@ tbody.collapse.show {
width: 1rem;
height: 1rem;
pointer-events: none;
content: "";
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
@ -3432,7 +3434,10 @@ tbody.collapse.show {
background-color: #dee2e6;
}
.custom-control-indicator::before {
.custom-control-label::after {
position: absolute;
top: 0.25rem;
left: 0;
display: block;
width: 1rem;
height: 1rem;
@ -3442,53 +3447,38 @@ tbody.collapse.show {
background-size: 50% 50%;
}
.custom-checkbox .custom-control-indicator {
.custom-checkbox .custom-control-label::before {
border-radius: 0.25rem;
}
.custom-checkbox .custom-control-input:checked ~ .custom-control-indicator {
.custom-checkbox .custom-control-input:checked ~ .custom-control-label::before {
background-color: #007bff;
}
.custom-checkbox .custom-control-input:checked ~ .custom-control-indicator::before {
.custom-checkbox .custom-control-input:checked ~ .custom-control-label::after {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E");
}
.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-indicator {
.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before {
background-color: #007bff;
}
.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-indicator::before {
.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::after {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E");
}
.custom-radio .custom-control-indicator {
.custom-radio .custom-control-label::before {
border-radius: 50%;
}
.custom-radio .custom-control-input:checked ~ .custom-control-indicator {
.custom-radio .custom-control-input:checked ~ .custom-control-label::before {
background-color: #007bff;
}
.custom-radio .custom-control-input:checked ~ .custom-control-indicator::before {
.custom-radio .custom-control-input:checked ~ .custom-control-label::after {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E");
}
.custom-controls-stacked {
display: -ms-flexbox;
display: flex;
-ms-flex-direction: column;
flex-direction: column;
}
.custom-controls-stacked .custom-control {
margin-bottom: 0.25rem;
}
.custom-controls-stacked .custom-control + .custom-control {
margin-left: 0;
}
.custom-select {
display: inline-block;
max-width: 100%;

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