aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2018-07-24 17:25:12 -0700
committerMark Otto <[email protected]>2018-07-24 17:25:12 -0700
commitfb2de04374a068594c84c1ec6aba6b5b3726ed27 (patch)
tree88f6d6f1a8a46282890c5eaa4776aed2a4ebd9e0 /dist/css/bootstrap.css
parentc6abb8ca8405777e8a3fb29016db5cc54889ec8b (diff)
parente3b98c51da4b39fa8af26ec05db07da57fefb0b6 (diff)
downloadbootstrap-fb2de04374a068594c84c1ec6aba6b5b3726ed27.tar.xz
bootstrap-fb2de04374a068594c84c1ec6aba6b5b3726ed27.zip
Merge branch 'v4-dev' into malkomich-v4-dev
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css167
1 files changed, 87 insertions, 80 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 8622f280e..943532db5 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v4.1.1 (https://getbootstrap.com/)
+ * Bootstrap v4.1.3 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
@@ -31,7 +31,7 @@
--breakpoint-md: 768px;
--breakpoint-lg: 992px;
--breakpoint-xl: 1200px;
- --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+ --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
}
@@ -60,7 +60,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
body {
margin: 0;
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-size: 1rem;
font-weight: 400;
line-height: 1.5;
@@ -210,7 +210,7 @@ img {
border-style: none;
}
-svg:not(:root) {
+svg {
overflow: hidden;
vertical-align: middle;
}
@@ -1516,7 +1516,6 @@ pre code {
.table {
width: 100%;
- max-width: 100%;
margin-bottom: 1rem;
background-color: transparent;
}
@@ -1812,6 +1811,7 @@ pre code {
.form-control {
display: block;
width: 100%;
+ height: calc(2.25rem + 2px);
padding: 0.375rem 0.75rem;
font-size: 1rem;
line-height: 1.5;
@@ -1872,10 +1872,6 @@ pre code {
opacity: 1;
}
-select.form-control:not([size]):not([multiple]) {
- height: calc(2.25rem + 2px);
-}
-
select.form-control:focus::-ms-value {
color: #495057;
background-color: #fff;
@@ -1922,55 +1918,33 @@ select.form-control:focus::-ms-value {
border-width: 1px 0;
}
-.form-control-plaintext.form-control-sm, .input-group-sm > .form-control-plaintext.form-control,
-.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 {
+.form-control-plaintext.form-control-sm, .form-control-plaintext.form-control-lg {
padding-right: 0;
padding-left: 0;
}
-.form-control-sm, .input-group-sm > .form-control,
-.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 {
+.form-control-sm {
+ height: calc(1.8125rem + 2px);
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
line-height: 1.5;
border-radius: 0.2rem;
}
-select.form-control-sm:not([size]):not([multiple]), .input-group-sm > select.form-control: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-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 {
+.form-control-lg {
+ height: calc(2.875rem + 2px);
padding: 0.5rem 1rem;
font-size: 1.25rem;
line-height: 1.5;
border-radius: 0.3rem;
}
-select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.form-control: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);
+select.form-control[size], select.form-control[multiple] {
+ height: auto;
+}
+
+textarea.form-control {
+ height: auto;
}
.form-group {
@@ -2047,13 +2021,13 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
z-index: 5;
display: none;
max-width: 100%;
- padding: .5rem;
+ padding: 0.25rem 0.5rem;
margin-top: .1rem;
- font-size: .875rem;
- line-height: 1;
+ font-size: 0.875rem;
+ line-height: 1.5;
color: #fff;
- background-color: rgba(40, 167, 69, 0.8);
- border-radius: .2rem;
+ background-color: rgba(40, 167, 69, 0.9);
+ border-radius: 0.25rem;
}
.was-validated .form-control:valid, .form-control.is-valid, .was-validated
@@ -2122,7 +2096,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
border-color: #28a745;
}
-.was-validated .custom-file-input:valid ~ .custom-file-label::before, .custom-file-input.is-valid ~ .custom-file-label::before {
+.was-validated .custom-file-input:valid ~ .custom-file-label::after, .custom-file-input.is-valid ~ .custom-file-label::after {
border-color: inherit;
}
@@ -2150,13 +2124,13 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
z-index: 5;
display: none;
max-width: 100%;
- padding: .5rem;
+ padding: 0.25rem 0.5rem;
margin-top: .1rem;
- font-size: .875rem;
- line-height: 1;
+ font-size: 0.875rem;
+ line-height: 1.5;
color: #fff;
- background-color: rgba(220, 53, 69, 0.8);
- border-radius: .2rem;
+ background-color: rgba(220, 53, 69, 0.9);
+ border-radius: 0.25rem;
}
.was-validated .form-control:invalid, .form-control.is-invalid, .was-validated
@@ -2225,7 +2199,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
border-color: #dc3545;
}
-.was-validated .custom-file-input:invalid ~ .custom-file-label::before, .custom-file-input.is-invalid ~ .custom-file-label::before {
+.was-validated .custom-file-input:invalid ~ .custom-file-label::after, .custom-file-input.is-invalid ~ .custom-file-label::after {
border-color: inherit;
}
@@ -2353,10 +2327,6 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
cursor: pointer;
}
-.btn:not(:disabled):not(.disabled):active, .btn:not(:disabled):not(.disabled).active {
- background-image: none;
-}
-
a.btn.disabled,
fieldset:disabled a.btn {
pointer-events: none;
@@ -3373,6 +3343,10 @@ input[type="button"].btn-block {
z-index: 3;
}
+.input-group > .custom-file .custom-file-input:focus {
+ z-index: 4;
+}
+
.input-group > .form-control:not(:last-child),
.input-group > .custom-select:not(:last-child) {
border-top-right-radius: 0;
@@ -3457,6 +3431,30 @@ input[type="button"].btn-block {
margin-top: 0;
}
+.input-group-lg > .form-control,
+.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 {
+ height: calc(2.875rem + 2px);
+ padding: 0.5rem 1rem;
+ font-size: 1.25rem;
+ line-height: 1.5;
+ border-radius: 0.3rem;
+}
+
+.input-group-sm > .form-control,
+.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 {
+ height: calc(1.8125rem + 2px);
+ padding: 0.25rem 0.5rem;
+ font-size: 0.875rem;
+ line-height: 1.5;
+ border-radius: 0.2rem;
+}
+
.input-group > .input-group-prepend > .btn,
.input-group > .input-group-prepend > .input-group-text,
.input-group > .input-group-append:not(:last-child) > .btn,
@@ -3732,6 +3730,18 @@ input[type="button"].btn-block {
outline: none;
}
+.custom-range:focus::-webkit-slider-thumb {
+ box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+}
+
+.custom-range:focus::-moz-range-thumb {
+ box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+}
+
+.custom-range:focus::-ms-thumb {
+ box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+}
+
.custom-range::-moz-focus-outer {
border: 0;
}
@@ -3754,11 +3764,6 @@ input[type="button"].btn-block {
}
}
-.custom-range::-webkit-slider-thumb:focus {
- outline: none;
- box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
-}
-
.custom-range::-webkit-slider-thumb:active {
background-color: #b3d7ff;
}
@@ -3790,11 +3795,6 @@ input[type="button"].btn-block {
}
}
-.custom-range::-moz-range-thumb:focus {
- outline: none;
- box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
-}
-
.custom-range::-moz-range-thumb:active {
background-color: #b3d7ff;
}
@@ -3812,6 +3812,9 @@ input[type="button"].btn-block {
.custom-range::-ms-thumb {
width: 1rem;
height: 1rem;
+ margin-top: 0;
+ margin-right: 0.2rem;
+ margin-left: 0.2rem;
background-color: #007bff;
border: 0;
border-radius: 1rem;
@@ -3825,11 +3828,6 @@ input[type="button"].btn-block {
}
}
-.custom-range::-ms-thumb:focus {
- outline: none;
- box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
-}
-
.custom-range::-ms-thumb:active {
background-color: #b3d7ff;
}
@@ -5344,6 +5342,11 @@ button.close {
overflow: hidden;
}
+.modal-open .modal {
+ overflow-x: hidden;
+ overflow-y: auto;
+}
+
.modal {
position: fixed;
top: 0;
@@ -5356,11 +5359,6 @@ button.close {
outline: 0;
}
-.modal-open .modal {
- overflow-x: hidden;
- overflow-y: auto;
-}
-
.modal-dialog {
position: relative;
width: auto;
@@ -5395,6 +5393,12 @@ button.close {
min-height: calc(100% - (0.5rem * 2));
}
+.modal-dialog-centered::before {
+ display: block;
+ height: calc(100vh - (0.5rem * 2));
+ content: "";
+}
+
.modal-content {
position: relative;
display: -ms-flexbox;
@@ -5493,6 +5497,9 @@ button.close {
.modal-dialog-centered {
min-height: calc(100% - (1.75rem * 2));
}
+ .modal-dialog-centered::before {
+ height: calc(100vh - (1.75rem * 2));
+ }
.modal-sm {
max-width: 300px;
}
@@ -5509,7 +5516,7 @@ button.close {
z-index: 1070;
display: block;
margin: 0;
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-style: normal;
font-weight: 400;
line-height: 1.5;
@@ -5622,7 +5629,7 @@ button.close {
z-index: 1060;
display: block;
max-width: 276px;
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-style: normal;
font-weight: 400;
line-height: 1.5;