2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
This commit is contained in:
Mark Otto
2017-12-22 16:21:54 -08:00
parent 13150872c6
commit 935d45f461
31 changed files with 381 additions and 344 deletions
+110 -127
View File
@@ -1943,17 +1943,23 @@ select.form-control:focus::-ms-value {
}
.form-control-plaintext.form-control-sm, .input-group-sm > .form-control-plaintext.form-control,
.input-group-sm > .form-control-plaintext.input-group-addon,
.input-group-sm > .input-group-btn > .form-control-plaintext.btn, .form-control-plaintext.form-control-lg, .input-group-lg > .form-control-plaintext.form-control,
.input-group-lg > .form-control-plaintext.input-group-addon,
.input-group-lg > .input-group-btn > .form-control-plaintext.btn {
.input-group-sm > .input-group-prepend > .form-control-plaintext.input-group-text,
.input-group-sm > .input-group-append > .form-control-plaintext.input-group-text,
.input-group-sm > .input-group-prepend > .form-control-plaintext.btn,
.input-group-sm > .input-group-append > .form-control-plaintext.btn, .form-control-plaintext.form-control-lg, .input-group-lg > .form-control-plaintext.form-control,
.input-group-lg > .input-group-prepend > .form-control-plaintext.input-group-text,
.input-group-lg > .input-group-append > .form-control-plaintext.input-group-text,
.input-group-lg > .input-group-prepend > .form-control-plaintext.btn,
.input-group-lg > .input-group-append > .form-control-plaintext.btn {
padding-right: 0;
padding-left: 0;
}
.form-control-sm, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .btn {
.input-group-sm > .input-group-prepend > .input-group-text,
.input-group-sm > .input-group-append > .input-group-text,
.input-group-sm > .input-group-prepend > .btn,
.input-group-sm > .input-group-append > .btn {
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
line-height: 1.5;
@@ -1961,14 +1967,18 @@ select.form-control:focus::-ms-value {
}
select.form-control-sm:not([size]):not([multiple]), .input-group-sm > select.form-control:not([size]):not([multiple]),
.input-group-sm > select.input-group-addon:not([size]):not([multiple]),
.input-group-sm > .input-group-btn > select.btn:not([size]):not([multiple]) {
.input-group-sm > .input-group-prepend > select.input-group-text:not([size]):not([multiple]),
.input-group-sm > .input-group-append > select.input-group-text:not([size]):not([multiple]),
.input-group-sm > .input-group-prepend > select.btn:not([size]):not([multiple]),
.input-group-sm > .input-group-append > select.btn:not([size]):not([multiple]) {
height: calc(1.8125rem + 2px);
}
.form-control-lg, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
.input-group-lg > .input-group-prepend > .input-group-text,
.input-group-lg > .input-group-append > .input-group-text,
.input-group-lg > .input-group-prepend > .btn,
.input-group-lg > .input-group-append > .btn {
padding: 0.5rem 1rem;
font-size: 1.25rem;
line-height: 1.5;
@@ -1976,8 +1986,10 @@ select.form-control-sm:not([size]):not([multiple]), .input-group-sm > select.for
}
select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.form-control:not([size]):not([multiple]),
.input-group-lg > select.input-group-addon:not([size]):not([multiple]),
.input-group-lg > .input-group-btn > select.btn:not([size]):not([multiple]) {
.input-group-lg > .input-group-prepend > select.input-group-text:not([size]):not([multiple]),
.input-group-lg > .input-group-append > select.input-group-text:not([size]):not([multiple]),
.input-group-lg > .input-group-prepend > select.btn:not([size]):not([multiple]),
.input-group-lg > .input-group-append > select.btn:not([size]):not([multiple]) {
height: calc(2.875rem + 2px);
}
@@ -2037,6 +2049,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.valid-feedback {
display: none;
width: 100%;
margin-top: 0.25rem;
font-size: 80%;
color: #28a745;
@@ -2115,6 +2128,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.invalid-feedback {
display: none;
width: 100%;
margin-top: 0.25rem;
font-size: 80%;
color: #dc3545;
@@ -3226,61 +3240,103 @@ tbody.collapse.show {
position: relative;
display: -ms-flexbox;
display: flex;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
-ms-flex-align: stretch;
align-items: stretch;
width: 100%;
}
.input-group .form-control {
.input-group .form-control,
.input-group .custom-select,
.input-group .custom-file {
position: relative;
z-index: 1;
-ms-flex: 1 1 auto;
flex: 1 1 auto;
width: 1%;
margin-bottom: 0;
}
.input-group .form-control:focus, .input-group .form-control:active, .input-group .form-control:hover {
z-index: 2;
.input-group .form-control:focus,
.input-group .custom-select:focus,
.input-group .custom-file:focus {
z-index: 3;
}
.input-group-addon,
.input-group-btn,
.input-group .form-control,
.input-group .custom-select,
.input-group .custom-file {
display: -ms-flexbox;
display: flex;
-ms-flex-align: center;
align-items: center;
.input-group .form-control + .form-control,
.input-group .custom-select + .form-control,
.input-group .custom-file + .form-control {
margin-left: -1px;
}
.input-group-addon: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 .custom-select:not(:first-child):not(:last-child),
.input-group .custom-file:not(:first-child):not(:last-child) {
.input-group .form-control:not(:first-child):not(:last-of-type),
.input-group .custom-select:not(:first-child):not(:last-of-type) {
border-radius: 0;
}
.input-group .custom-file {
.input-group .form-control:first-child,
.input-group .custom-select:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.input-group .form-control:last-of-type:not(:first-child),
.input-group .custom-select:last-of-type:not(:first-child) {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
.input-group .custom-file:not(:first-child):not(:last-of-type) .custom-file-control,
.input-group .custom-file:not(:first-child):not(:last-of-type) .custom-file-control::before {
border-radius: 0;
}
.input-group .custom-file:first-child .custom-file-control,
.input-group .custom-file:first-child .custom-file-control::before {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.input-group .custom-file:last-of-type:not(:first-child) .custom-file-control,
.input-group .custom-file:last-of-type:not(:first-child) .custom-file-control::before {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
.input-group-prepend,
.input-group-append {
display: -ms-flexbox;
display: flex;
-ms-flex-align: center;
align-items: center;
}
.input-group .custom-select,
.input-group .custom-file {
width: 100%;
.input-group-prepend .btn,
.input-group-append .btn {
position: relative;
z-index: 2;
}
.input-group-addon,
.input-group-btn {
white-space: nowrap;
.input-group-prepend .btn + .btn,
.input-group-prepend .btn + .input-group-text,
.input-group-prepend .input-group-text + .input-group-text,
.input-group-prepend .input-group-text + .btn,
.input-group-append .btn + .btn,
.input-group-append .btn + .input-group-text,
.input-group-append .input-group-text + .input-group-text,
.input-group-append .input-group-text + .btn {
margin-left: -1px;
}
.input-group-addon {
.input-group-prepend {
margin-right: -1px;
}
.input-group-append {
margin-left: -1px;
}
.input-group-text {
padding: 0.375rem 0.75rem;
margin-bottom: 0;
font-size: 1rem;
@@ -3288,113 +3344,40 @@ tbody.collapse.show {
line-height: 1.5;
color: #495057;
text-align: center;
white-space: nowrap;
background-color: #e9ecef;
border: 1px solid #ced4da;
border-radius: 0.25rem;
}
.input-group-addon.form-control-sm,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .input-group-addon.btn {
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
border-radius: 0.2rem;
}
.input-group-addon.form-control-lg,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .input-group-addon.btn {
padding: 0.5rem 1rem;
font-size: 1.25rem;
border-radius: 0.3rem;
}
.input-group-addon input[type="radio"],
.input-group-addon input[type="checkbox"] {
.input-group-text input[type="radio"],
.input-group-text input[type="checkbox"] {
margin-top: 0;
}
.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-btn:not(:last-child) > .btn,
.input-group-btn:not(:last-child) > .btn-group > .btn,
.input-group-btn:not(:last-child) > .dropdown-toggle,
.input-group-btn:not(:first-child) > .btn:not(:last-child):not(.dropdown-toggle),
.input-group-btn:not(:first-child) > .btn-group:not(:last-child) > .btn {
.input-group > .input-group-prepend > .btn,
.input-group > .input-group-prepend > .input-group-text {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.input-group-addon:not(:last-child) {
border-right: 0;
}
.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-btn:not(:first-child) > .btn,
.input-group-btn:not(:first-child) > .btn-group > .btn,
.input-group-btn:not(:first-child) > .dropdown-toggle,
.input-group-btn:not(:last-child) > .btn:not(:first-child),
.input-group-btn:not(:last-child) > .btn-group:not(:first-child) > .btn {
.input-group > .input-group-prepend > .btn + .btn,
.input-group > .input-group-prepend > .btn + .input-group-text,
.input-group > .input-group-prepend > .input-group-text + .btn,
.input-group > .input-group-prepend > .input-group-text + .input-group-text {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
.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;
.input-group > .input-group-append .btn:not(:last-of-type),
.input-group > .input-group-append .input-group-text:not(:last-child) {
border-radius: 0;
}
.input-group-btn {
position: relative;
-ms-flex-align: stretch;
align-items: stretch;
font-size: 0;
white-space: nowrap;
}
.input-group-btn > .btn {
position: relative;
}
.input-group-btn > .btn + .btn {
margin-left: -1px;
}
.input-group-btn > .btn:focus, .input-group-btn > .btn:active, .input-group-btn > .btn:hover {
z-index: 2;
}
.input-group-btn:first-child > .btn + .btn {
margin-left: 0;
}
.input-group-btn:not(:last-child) > .btn,
.input-group-btn:not(:last-child) > .btn-group {
margin-right: -1px;
}
.input-group-btn:not(:first-child) > .btn,
.input-group-btn:not(:first-child) > .btn-group {
z-index: 1;
margin-left: 0;
}
.input-group-btn:not(:first-child) > .btn:first-child,
.input-group-btn:not(:first-child) > .btn-group:first-child {
margin-left: -1px;
}
.input-group-btn:not(:first-child) > .btn:focus, .input-group-btn:not(:first-child) > .btn:active, .input-group-btn:not(:first-child) > .btn:hover,
.input-group-btn:not(:first-child) > .btn-group:focus,
.input-group-btn:not(:first-child) > .btn-group:active,
.input-group-btn:not(:first-child) > .btn-group:hover {
z-index: 2;
.input-group > .input-group-append .btn:last-of-type,
.input-group > .input-group-append .input-group-text:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
.custom-control {