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-16 17:37:44 -08:00
parent 383221b21b
commit eaaad9574c
9 changed files with 106 additions and 74 deletions

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

File diff suppressed because one or more lines are too long

View File

@ -1778,7 +1778,7 @@ pre code {
background-color: rgba(255, 255, 255, 0.075);
}
@media (max-width: 575px) {
@media (max-width: 575.99px) {
.table-responsive-sm {
display: block;
width: 100%;
@ -1791,7 +1791,7 @@ pre code {
}
}
@media (max-width: 767px) {
@media (max-width: 767.99px) {
.table-responsive-md {
display: block;
width: 100%;
@ -1804,7 +1804,7 @@ pre code {
}
}
@media (max-width: 991px) {
@media (max-width: 991.99px) {
.table-responsive-lg {
display: block;
width: 100%;
@ -1817,7 +1817,7 @@ pre code {
}
}
@media (max-width: 1199px) {
@media (max-width: 1199.99px) {
.table-responsive-xl {
display: block;
width: 100%;
@ -1912,6 +1912,7 @@ select.form-control:focus::-ms-value {
padding-top: calc(0.375rem + 1px);
padding-bottom: calc(0.375rem + 1px);
margin-bottom: 0;
font-size: inherit;
line-height: 1.5;
}
@ -1929,13 +1930,6 @@ select.form-control:focus::-ms-value {
line-height: 1.5;
}
.col-form-legend {
padding-top: 0.375rem;
padding-bottom: 0.375rem;
margin-bottom: 0;
font-size: 1rem;
}
.form-control-plaintext {
display: block;
width: 100%;
@ -2043,8 +2037,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.valid-feedback {
display: none;
margin-top: .25rem;
font-size: .875rem;
margin-top: 0.25rem;
font-size: 80%;
color: #28a745;
}
@ -2092,13 +2086,17 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
}
.was-validated .custom-control-input:valid ~ .custom-control-indicator, .custom-control-input.is-valid ~ .custom-control-indicator {
background-color: rgba(40, 167, 69, 0.4);
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 {
background-color: #34ce57;
}
.was-validated .custom-control-input:valid:focus ~ .custom-control-indicator, .custom-control-input.is-valid:focus ~ .custom-control-indicator {
box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
}
@ -2117,8 +2115,8 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.invalid-feedback {
display: none;
margin-top: .25rem;
font-size: .875rem;
margin-top: 0.25rem;
font-size: 80%;
color: #dc3545;
}
@ -2166,13 +2164,17 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
}
.was-validated .custom-control-input:invalid ~ .custom-control-indicator, .custom-control-input.is-invalid ~ .custom-control-indicator {
background-color: rgba(220, 53, 69, 0.4);
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 {
background-color: #e4606d;
}
.was-validated .custom-control-input:invalid:focus ~ .custom-control-indicator, .custom-control-input.is-invalid:focus ~ .custom-control-indicator {
box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
}
@ -2570,7 +2572,7 @@ fieldset[disabled] a.btn {
.btn-outline-primary:not([disabled]):not(.disabled):active, .btn-outline-primary:not([disabled]):not(.disabled).active,
.show > .btn-outline-primary.dropdown-toggle {
color: #fff;
color: #212529;
background-color: #007bff;
border-color: #007bff;
box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
@ -2600,7 +2602,7 @@ fieldset[disabled] a.btn {
.btn-outline-secondary:not([disabled]):not(.disabled):active, .btn-outline-secondary:not([disabled]):not(.disabled).active,
.show > .btn-outline-secondary.dropdown-toggle {
color: #fff;
color: #212529;
background-color: #868e96;
border-color: #868e96;
box-shadow: 0 0 0 0.2rem rgba(134, 142, 150, 0.5);
@ -2630,7 +2632,7 @@ fieldset[disabled] a.btn {
.btn-outline-success:not([disabled]):not(.disabled):active, .btn-outline-success:not([disabled]):not(.disabled).active,
.show > .btn-outline-success.dropdown-toggle {
color: #fff;
color: #212529;
background-color: #28a745;
border-color: #28a745;
box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
@ -2660,7 +2662,7 @@ fieldset[disabled] a.btn {
.btn-outline-info:not([disabled]):not(.disabled):active, .btn-outline-info:not([disabled]):not(.disabled).active,
.show > .btn-outline-info.dropdown-toggle {
color: #fff;
color: #212529;
background-color: #17a2b8;
border-color: #17a2b8;
box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
@ -2674,7 +2676,7 @@ fieldset[disabled] a.btn {
}
.btn-outline-warning:hover {
color: #fff;
color: #212529;
background-color: #ffc107;
border-color: #ffc107;
}
@ -2690,7 +2692,7 @@ fieldset[disabled] a.btn {
.btn-outline-warning:not([disabled]):not(.disabled):active, .btn-outline-warning:not([disabled]):not(.disabled).active,
.show > .btn-outline-warning.dropdown-toggle {
color: #fff;
color: #212529;
background-color: #ffc107;
border-color: #ffc107;
box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
@ -2720,7 +2722,7 @@ fieldset[disabled] a.btn {
.btn-outline-danger:not([disabled]):not(.disabled):active, .btn-outline-danger:not([disabled]):not(.disabled).active,
.show > .btn-outline-danger.dropdown-toggle {
color: #fff;
color: #212529;
background-color: #dc3545;
border-color: #dc3545;
box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
@ -2750,7 +2752,7 @@ fieldset[disabled] a.btn {
.btn-outline-light:not([disabled]):not(.disabled):active, .btn-outline-light:not([disabled]):not(.disabled).active,
.show > .btn-outline-light.dropdown-toggle {
color: #212529;
color: #fff;
background-color: #f8f9fa;
border-color: #f8f9fa;
box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
@ -2780,7 +2782,7 @@ fieldset[disabled] a.btn {
.btn-outline-dark:not([disabled]):not(.disabled):active, .btn-outline-dark:not([disabled]):not(.disabled).active,
.show > .btn-outline-dark.dropdown-toggle {
color: #fff;
color: #212529;
background-color: #343a40;
border-color: #343a40;
box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
@ -2800,6 +2802,7 @@ fieldset[disabled] a.btn {
}
.btn-link:focus, .btn-link.focus {
text-decoration: underline;
border-color: transparent;
box-shadow: none;
}
@ -3205,15 +3208,15 @@ tbody.collapse.show {
border-top-right-radius: 0;
}
[data-toggle="buttons"] > .btn,
[data-toggle="buttons"] > .btn-group > .btn {
.btn-group-toggle > .btn,
.btn-group-toggle > .btn-group > .btn {
margin-bottom: 0;
}
[data-toggle="buttons"] > .btn input[type="radio"],
[data-toggle="buttons"] > .btn input[type="checkbox"],
[data-toggle="buttons"] > .btn-group > .btn input[type="radio"],
[data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] {
.btn-group-toggle > .btn input[type="radio"],
.btn-group-toggle > .btn input[type="checkbox"],
.btn-group-toggle > .btn-group > .btn input[type="radio"],
.btn-group-toggle > .btn-group > .btn input[type="checkbox"] {
position: absolute;
clip: rect(0, 0, 0, 0);
pointer-events: none;
@ -3444,6 +3447,13 @@ tbody.collapse.show {
-ms-user-select: none;
user-select: none;
background-color: #dee2e6;
}
.custom-control-indicator::before {
display: block;
width: 1rem;
height: 1rem;
content: "";
background-repeat: no-repeat;
background-position: center center;
background-size: 50% 50%;
@ -3454,11 +3464,18 @@ tbody.collapse.show {
}
.custom-checkbox .custom-control-input:checked ~ .custom-control-indicator {
background-color: #007bff;
}
.custom-checkbox .custom-control-input:checked ~ .custom-control-indicator::before {
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 {
background-color: #007bff;
}
.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-indicator::before {
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");
}
@ -3467,6 +3484,10 @@ tbody.collapse.show {
}
.custom-radio .custom-control-input:checked ~ .custom-control-indicator {
background-color: #007bff;
}
.custom-radio .custom-control-input:checked ~ .custom-control-indicator::before {
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");
}
@ -3505,6 +3526,7 @@ tbody.collapse.show {
.custom-select:focus {
border-color: #80bdff;
outline: 0;
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
}
.custom-select:focus::-ms-value {
@ -3512,8 +3534,9 @@ tbody.collapse.show {
background-color: #fff;
}
.custom-select[multiple] {
.custom-select[multiple], .custom-select[size]:not([size="1"]) {
height: auto;
padding-right: 0.75rem;
background-image: none;
}
@ -3533,6 +3556,13 @@ tbody.collapse.show {
font-size: 75%;
}
.custom-select-lg {
height: calc(2.875rem + 2px);
padding-top: 0.375rem;
padding-bottom: 0.375rem;
font-size: 125%;
}
.custom-file {
position: relative;
display: inline-block;
@ -3550,7 +3580,12 @@ tbody.collapse.show {
}
.custom-file-input:focus ~ .custom-file-control {
box-shadow: 0 0 0 0.075rem #fff, 0 0 0 0.2rem #007bff;
border-color: #80bdff;
box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
}
.custom-file-input:focus ~ .custom-file-control::before {
border-color: #80bdff;
}
.custom-file-control {
@ -3785,7 +3820,7 @@ tbody.collapse.show {
background-size: 100% 100%;
}
@media (max-width: 575px) {
@media (max-width: 575.99px) {
.navbar-expand-sm > .container,
.navbar-expand-sm > .container-fluid {
padding-right: 0;
@ -3835,7 +3870,7 @@ tbody.collapse.show {
}
}
@media (max-width: 767px) {
@media (max-width: 767.99px) {
.navbar-expand-md > .container,
.navbar-expand-md > .container-fluid {
padding-right: 0;
@ -3885,7 +3920,7 @@ tbody.collapse.show {
}
}
@media (max-width: 991px) {
@media (max-width: 991.99px) {
.navbar-expand-lg > .container,
.navbar-expand-lg > .container-fluid {
padding-right: 0;
@ -3935,7 +3970,7 @@ tbody.collapse.show {
}
}
@media (max-width: 1199px) {
@media (max-width: 1199.99px) {
.navbar-expand-xl > .container,
.navbar-expand-xl > .container-fluid {
padding-right: 0;
@ -4292,7 +4327,7 @@ tbody.collapse.show {
flex-direction: column;
}
.card-group .card {
.card-group > .card {
margin-bottom: 15px;
}
@ -4301,59 +4336,59 @@ tbody.collapse.show {
-ms-flex-flow: row wrap;
flex-flow: row wrap;
}
.card-group .card {
.card-group > .card {
-ms-flex: 1 0 0%;
flex: 1 0 0%;
margin-bottom: 0;
}
.card-group .card + .card {
.card-group > .card + .card {
margin-left: 0;
border-left: 0;
}
.card-group .card:first-child {
.card-group > .card:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.card-group .card:first-child .card-img-top,
.card-group .card:first-child .card-header {
.card-group > .card:first-child .card-img-top,
.card-group > .card:first-child .card-header {
border-top-right-radius: 0;
}
.card-group .card:first-child .card-img-bottom,
.card-group .card:first-child .card-footer {
.card-group > .card:first-child .card-img-bottom,
.card-group > .card:first-child .card-footer {
border-bottom-right-radius: 0;
}
.card-group .card:last-child {
.card-group > .card:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
.card-group .card:last-child .card-img-top,
.card-group .card:last-child .card-header {
.card-group > .card:last-child .card-img-top,
.card-group > .card:last-child .card-header {
border-top-left-radius: 0;
}
.card-group .card:last-child .card-img-bottom,
.card-group .card:last-child .card-footer {
.card-group > .card:last-child .card-img-bottom,
.card-group > .card:last-child .card-footer {
border-bottom-left-radius: 0;
}
.card-group .card:only-child {
.card-group > .card:only-child {
border-radius: 0.25rem;
}
.card-group .card:only-child .card-img-top,
.card-group .card:only-child .card-header {
.card-group > .card:only-child .card-img-top,
.card-group > .card:only-child .card-header {
border-top-left-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
.card-group .card:only-child .card-img-bottom,
.card-group .card:only-child .card-footer {
.card-group > .card:only-child .card-img-bottom,
.card-group > .card:only-child .card-footer {
border-bottom-right-radius: 0.25rem;
border-bottom-left-radius: 0.25rem;
}
.card-group .card:not(:first-child):not(:last-child):not(:only-child) {
.card-group > .card:not(:first-child):not(:last-child):not(:only-child) {
border-radius: 0;
}
.card-group .card:not(:first-child):not(:last-child):not(:only-child) .card-img-top,
.card-group .card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom,
.card-group .card:not(:first-child):not(:last-child):not(:only-child) .card-header,
.card-group .card:not(:first-child):not(:last-child):not(:only-child) .card-footer {
.card-group > .card:not(:first-child):not(:last-child):not(:only-child) .card-img-top,
.card-group > .card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom,
.card-group > .card:not(:first-child):not(:last-child):not(:only-child) .card-header,
.card-group > .card:not(:first-child):not(:last-child):not(:only-child) .card-footer {
border-radius: 0;
}
}
@ -5164,9 +5199,7 @@ button.close {
display: flex;
-ms-flex-align: center;
align-items: center;
height: 100%;
margin-top: 0;
margin-bottom: 0;
min-height: calc(100% - (0.5rem * 2));
}
.modal-content {
@ -5265,8 +5298,7 @@ button.close {
margin: 1.75rem auto;
}
.modal-dialog-centered {
margin-top: 0;
margin-bottom: 0;
min-height: calc(100% - (1.75rem * 2));
}
.modal-sm {
max-width: 300px;

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