0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-26 23:54:23 +01:00
This commit is contained in:
Mark Otto 2017-10-22 19:40:05 -07:00
parent 2f90be3150
commit a79e0f9c78
9 changed files with 80 additions and 46 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

@ -2091,13 +2091,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 { .was-validated .custom-control-input:valid ~ .custom-control-indicator, .custom-control-input.is-valid ~ .custom-control-indicator {
background-color: rgba(40, 167, 69, 0.25); background-color: rgba(40, 167, 69, 0.4);
} }
.was-validated .custom-control-input:valid ~ .custom-control-description, .custom-control-input.is-valid ~ .custom-control-description { .was-validated .custom-control-input:valid ~ .custom-control-description, .custom-control-input.is-valid ~ .custom-control-description {
color: #28a745; color: #28a745;
} }
.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);
}
.was-validated .custom-file-input:valid ~ .custom-file-control, .custom-file-input.is-valid ~ .custom-file-control { .was-validated .custom-file-input:valid ~ .custom-file-control, .custom-file-input.is-valid ~ .custom-file-control {
border-color: #28a745; border-color: #28a745;
} }
@ -2106,7 +2110,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
border-color: inherit; border-color: inherit;
} }
.was-validated .custom-file-input:valid:focus, .custom-file-input.is-valid:focus { .was-validated .custom-file-input:valid:focus ~ .custom-file-control, .custom-file-input.is-valid:focus ~ .custom-file-control {
box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25); box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
} }
@ -2160,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 { .was-validated .custom-control-input:invalid ~ .custom-control-indicator, .custom-control-input.is-invalid ~ .custom-control-indicator {
background-color: rgba(220, 53, 69, 0.25); background-color: rgba(220, 53, 69, 0.4);
} }
.was-validated .custom-control-input:invalid ~ .custom-control-description, .custom-control-input.is-invalid ~ .custom-control-description { .was-validated .custom-control-input:invalid ~ .custom-control-description, .custom-control-input.is-invalid ~ .custom-control-description {
color: #dc3545; color: #dc3545;
} }
.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);
}
.was-validated .custom-file-input:invalid ~ .custom-file-control, .custom-file-input.is-invalid ~ .custom-file-control { .was-validated .custom-file-input:invalid ~ .custom-file-control, .custom-file-input.is-invalid ~ .custom-file-control {
border-color: #dc3545; border-color: #dc3545;
} }
@ -2175,7 +2183,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
border-color: inherit; border-color: inherit;
} }
.was-validated .custom-file-input:invalid:focus, .custom-file-input.is-invalid:focus { .was-validated .custom-file-input:invalid:focus ~ .custom-file-control, .custom-file-input.is-invalid:focus ~ .custom-file-control {
box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25); box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
} }
@ -2279,7 +2287,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
font-size: 1rem; font-size: 1rem;
line-height: 1.5; line-height: 1.5;
border-radius: 0.25rem; border-radius: 0.25rem;
transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
} }
.btn:focus, .btn:hover { .btn:focus, .btn:hover {
@ -3170,7 +3178,9 @@ tbody.collapse.show {
.input-group-addon, .input-group-addon,
.input-group-btn, .input-group-btn,
.input-group .form-control { .input-group .form-control,
.input-group .custom-select,
.input-group .custom-file {
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
-ms-flex-align: center; -ms-flex-align: center;
@ -3179,10 +3189,24 @@ tbody.collapse.show {
.input-group-addon:not(:first-child):not(:last-child), .input-group-addon:not(:first-child):not(:last-child),
.input-group-btn:not(:first-child):not(:last-child), .input-group-btn:not(:first-child):not(:last-child),
.input-group .form-control:not(:first-child):not(:last-child) { .input-group .form-control:not(:first-child):not(:last-child),
.input-group .custom-select:not(:first-child):not(:last-child),
.input-group .custom-file:not(:first-child):not(:last-child) {
border-radius: 0; border-radius: 0;
} }
.input-group .custom-file {
display: -ms-flexbox;
display: flex;
-ms-flex-align: center;
align-items: center;
}
.input-group .custom-select,
.input-group .custom-file {
width: 100%;
}
.input-group-addon, .input-group-addon,
.input-group-btn { .input-group-btn {
white-space: nowrap; white-space: nowrap;
@ -3223,6 +3247,8 @@ tbody.collapse.show {
} }
.input-group .form-control:not(:last-child), .input-group .form-control:not(:last-child),
.input-group .custom-select:not(:last-child),
.input-group .custom-file:not(:last-child) .custom-file-control::before,
.input-group-addon:not(:last-child), .input-group-addon:not(:last-child),
.input-group-btn:not(:last-child) > .btn, .input-group-btn:not(:last-child) > .btn,
.input-group-btn:not(:last-child) > .btn-group > .btn, .input-group-btn:not(:last-child) > .btn-group > .btn,
@ -3238,6 +3264,8 @@ tbody.collapse.show {
} }
.input-group .form-control:not(:first-child), .input-group .form-control:not(:first-child),
.input-group .custom-select:not(:first-child),
.input-group .custom-file:not(:first-child) .custom-file-control,
.input-group-addon:not(:first-child), .input-group-addon:not(:first-child),
.input-group-btn:not(:first-child) > .btn, .input-group-btn:not(:first-child) > .btn,
.input-group-btn:not(:first-child) > .btn-group > .btn, .input-group-btn:not(:first-child) > .btn-group > .btn,
@ -3248,7 +3276,9 @@ tbody.collapse.show {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.form-control + .input-group-addon:not(:first-child) { .form-control + .input-group-addon:not(:first-child),
.custom-select + .input-group-addon:not(:first-child),
.custom-file + .input-group-addon:not(:first-child) {
border-left: 0; border-left: 0;
} }
@ -4321,6 +4351,24 @@ tbody.collapse.show {
border-radius: 0.25rem; border-radius: 0.25rem;
} }
.page-link {
position: relative;
display: block;
padding: 0.5rem 0.75rem;
margin-left: -1px;
line-height: 1.25;
color: #007bff;
background-color: #fff;
border: 1px solid #ddd;
}
.page-link:focus, .page-link:hover {
color: #0056b3;
text-decoration: none;
background-color: #e9ecef;
border-color: #ddd;
}
.page-item:first-child .page-link { .page-item:first-child .page-link {
margin-left: 0; margin-left: 0;
border-top-left-radius: 0.25rem; border-top-left-radius: 0.25rem;
@ -4346,24 +4394,6 @@ tbody.collapse.show {
border-color: #ddd; border-color: #ddd;
} }
.page-link {
position: relative;
display: block;
padding: 0.5rem 0.75rem;
margin-left: -1px;
line-height: 1.25;
color: #007bff;
background-color: #fff;
border: 1px solid #ddd;
}
.page-link:focus, .page-link:hover {
color: #0056b3;
text-decoration: none;
background-color: #e9ecef;
border-color: #ddd;
}
.pagination-lg .page-link { .pagination-lg .page-link {
padding: 0.75rem 1.5rem; padding: 0.75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
@ -4546,6 +4576,10 @@ tbody.collapse.show {
font-weight: 700; font-weight: 700;
} }
.alert-dismissible {
padding-right: 4rem;
}
.alert-dismissible .close { .alert-dismissible .close {
position: absolute; position: absolute;
top: 0; top: 0;
@ -5034,6 +5068,18 @@ button.close {
outline: 0; outline: 0;
} }
.modal-open .modal {
overflow-x: hidden;
overflow-y: auto;
}
.modal-dialog {
position: relative;
width: auto;
margin: 10px;
pointer-events: none;
}
.modal.fade .modal-dialog { .modal.fade .modal-dialog {
transition: -webkit-transform 0.3s ease-out; transition: -webkit-transform 0.3s ease-out;
transition: transform 0.3s ease-out; transition: transform 0.3s ease-out;
@ -5047,18 +5093,6 @@ button.close {
transform: translate(0, 0); transform: translate(0, 0);
} }
.modal-open .modal {
overflow-x: hidden;
overflow-y: auto;
}
.modal-dialog {
position: relative;
width: auto;
margin: 10px;
pointer-events: none;
}
.modal-content { .modal-content {
position: relative; position: relative;
display: -ms-flexbox; display: -ms-flexbox;

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