diff options
Diffstat (limited to 'vendor/twbs/bootstrap/scss')
-rw-r--r-- | vendor/twbs/bootstrap/scss/_card.scss | 16 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/_custom-forms.scss | 9 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/_grid.scss | 6 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/_modal.scss | 1 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/_nav.scss | 2 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/_reboot.scss | 2 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/_toasts.scss | 6 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/_variables.scss | 23 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/bootstrap-grid.scss | 4 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/bootstrap-reboot.scss | 4 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/bootstrap.scss | 4 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/mixins/_forms.scss | 1 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/mixins/_grid-framework.scss | 1 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/mixins/_grid.scss | 14 | ||||
-rw-r--r-- | vendor/twbs/bootstrap/scss/utilities/_text.scss | 3 |
15 files changed, 47 insertions, 49 deletions
diff --git a/vendor/twbs/bootstrap/scss/_card.scss b/vendor/twbs/bootstrap/scss/_card.scss index fabe9f367..7c35f7ed8 100644 --- a/vendor/twbs/bootstrap/scss/_card.scss +++ b/vendor/twbs/bootstrap/scss/_card.scss @@ -33,6 +33,13 @@ @include border-bottom-radius($card-inner-border-radius); } } + + // Due to specificity of the above selector (`.card > .list-group`), we must + // use a child selector here to prevent double borders. + > .card-header + .list-group, + > .list-group + .card-footer { + border-top: 0; + } } .card-body { @@ -83,12 +90,6 @@ &:first-child { @include border-radius($card-inner-border-radius $card-inner-border-radius 0 0); } - - + .list-group { - .list-group-item:first-child { - border-top: 0; - } - } } .card-footer { @@ -127,6 +128,7 @@ bottom: 0; left: 0; padding: $card-img-overlay-padding; + @include border-radius($card-inner-border-radius); } .card-img, @@ -262,6 +264,8 @@ // .accordion { + overflow-anchor: none; + > .card { overflow: hidden; diff --git a/vendor/twbs/bootstrap/scss/_custom-forms.scss b/vendor/twbs/bootstrap/scss/_custom-forms.scss index 0804c63cf..9aeeeda7f 100644 --- a/vendor/twbs/bootstrap/scss/_custom-forms.scss +++ b/vendor/twbs/bootstrap/scss/_custom-forms.scss @@ -9,6 +9,7 @@ .custom-control { position: relative; + z-index: 1; display: block; min-height: $font-size-base * $line-height-base; padding-left: $custom-control-gutter + $custom-control-indicator-size; @@ -135,10 +136,10 @@ .custom-control-input:disabled { &:checked ~ .custom-control-label::before { - background-color: $custom-control-indicator-checked-disabled-bg; + @include gradient-bg($custom-control-indicator-checked-disabled-bg); } &:indeterminate ~ .custom-control-label::before { - background-color: $custom-control-indicator-checked-disabled-bg; + @include gradient-bg($custom-control-indicator-checked-disabled-bg); } } } @@ -161,7 +162,7 @@ .custom-control-input:disabled { &:checked ~ .custom-control-label::before { - background-color: $custom-control-indicator-checked-disabled-bg; + @include gradient-bg($custom-control-indicator-checked-disabled-bg); } } } @@ -204,7 +205,7 @@ .custom-control-input:disabled { &:checked ~ .custom-control-label::before { - background-color: $custom-control-indicator-checked-disabled-bg; + @include gradient-bg($custom-control-indicator-checked-disabled-bg); } } } diff --git a/vendor/twbs/bootstrap/scss/_grid.scss b/vendor/twbs/bootstrap/scss/_grid.scss index 57ec5a9d0..0bfe5303b 100644 --- a/vendor/twbs/bootstrap/scss/_grid.scss +++ b/vendor/twbs/bootstrap/scss/_grid.scss @@ -4,11 +4,7 @@ @if $enable-grid-classes { // Single container class with breakpoint max-widths - .container { - @include make-container(); - @include make-container-max-widths(); - } - + .container, // 100% wide container at all breakpoints .container-fluid { @include make-container(); diff --git a/vendor/twbs/bootstrap/scss/_modal.scss b/vendor/twbs/bootstrap/scss/_modal.scss index a6d0f0651..e43c70fbb 100644 --- a/vendor/twbs/bootstrap/scss/_modal.scss +++ b/vendor/twbs/bootstrap/scss/_modal.scss @@ -182,7 +182,6 @@ // Place margin between footer elements // This solution is far from ideal because of the universal selector usage, // but is needed to fix https://github.com/twbs/bootstrap/issues/24800 - // stylelint-disable-next-line selector-max-universal > * { margin: $modal-footer-margin-between / 2; } diff --git a/vendor/twbs/bootstrap/scss/_nav.scss b/vendor/twbs/bootstrap/scss/_nav.scss index b8b73bb7a..d866c9841 100644 --- a/vendor/twbs/bootstrap/scss/_nav.scss +++ b/vendor/twbs/bootstrap/scss/_nav.scss @@ -92,6 +92,7 @@ // .nav-fill { + > .nav-link, .nav-item { flex: 1 1 auto; text-align: center; @@ -99,6 +100,7 @@ } .nav-justified { + > .nav-link, .nav-item { flex-basis: 0; flex-grow: 1; diff --git a/vendor/twbs/bootstrap/scss/_reboot.scss b/vendor/twbs/bootstrap/scss/_reboot.scss index 5a52b58fc..4444ff0f0 100644 --- a/vendor/twbs/bootstrap/scss/_reboot.scss +++ b/vendor/twbs/bootstrap/scss/_reboot.scss @@ -199,7 +199,7 @@ a { // causes specificity issues in many other styles that are too complex to fix. // See https://github.com/twbs/bootstrap/issues/19402 -a:not([href]) { +a:not([href]):not([class]) { color: inherit; text-decoration: none; diff --git a/vendor/twbs/bootstrap/scss/_toasts.scss b/vendor/twbs/bootstrap/scss/_toasts.scss index 6aa5352a3..f9ca8d91c 100644 --- a/vendor/twbs/bootstrap/scss/_toasts.scss +++ b/vendor/twbs/bootstrap/scss/_toasts.scss @@ -1,13 +1,14 @@ .toast { + // Prevents from shrinking in IE11, when in a flex container + // See https://github.com/twbs/bootstrap/issues/28341 + flex-basis: $toast-max-width; max-width: $toast-max-width; - overflow: hidden; // cheap rounded corners on nested items @include font-size($toast-font-size); color: $toast-color; background-color: $toast-background-color; background-clip: padding-box; border: $toast-border-width solid $toast-border-color; box-shadow: $toast-box-shadow; - backdrop-filter: blur(10px); opacity: 0; @include border-radius($toast-border-radius); @@ -37,6 +38,7 @@ background-color: $toast-header-background-color; background-clip: padding-box; border-bottom: $toast-border-width solid $toast-header-border-color; + @include border-top-radius(subtract($toast-border-radius, $toast-border-width)); } .toast-body { diff --git a/vendor/twbs/bootstrap/scss/_variables.scss b/vendor/twbs/bootstrap/scss/_variables.scss index 22fafe10c..3ff0c65b3 100644 --- a/vendor/twbs/bootstrap/scss/_variables.scss +++ b/vendor/twbs/bootstrap/scss/_variables.scss @@ -18,7 +18,6 @@ $gray-900: #212529 !default; $black: #000 !default; $grays: () !default; -// stylelint-disable-next-line scss/dollar-variable-default $grays: map-merge( ( "100": $gray-100, @@ -46,7 +45,6 @@ $teal: #20c997 !default; $cyan: #17a2b8 !default; $colors: () !default; -// stylelint-disable-next-line scss/dollar-variable-default $colors: map-merge( ( "blue": $blue, @@ -76,7 +74,6 @@ $light: $gray-100 !default; $dark: $gray-800 !default; $theme-colors: () !default; -// stylelint-disable-next-line scss/dollar-variable-default $theme-colors: map-merge( ( "primary": $primary, @@ -103,11 +100,11 @@ $yiq-text-light: $white !default; // Characters which are escaped by the escape-svg function $escaped-characters: ( - ("<","%3c"), - (">","%3e"), - ("#","%23"), - ("(","%28"), - (")","%29"), + ("<", "%3c"), + (">", "%3e"), + ("#", "%23"), + ("(", "%28"), + (")", "%29"), ) !default; @@ -138,7 +135,6 @@ $enable-deprecation-messages: true !default; $spacer: 1rem !default; $spacers: () !default; -// stylelint-disable-next-line scss/dollar-variable-default $spacers: map-merge( ( 0: 0, @@ -153,7 +149,6 @@ $spacers: map-merge( // This variable affects the `.h-*` and `.w-*` classes. $sizes: () !default; -// stylelint-disable-next-line scss/dollar-variable-default $sizes: map-merge( ( 25: 25%, @@ -264,7 +259,6 @@ $transition-fade: opacity .15s linear !default; $transition-collapse: height .35s ease !default; $embed-responsive-aspect-ratios: () !default; -// stylelint-disable-next-line scss/dollar-variable-default $embed-responsive-aspect-ratios: join( ( (21 9), @@ -546,7 +540,7 @@ $custom-control-label-disabled-color: $gray-600 !default; $custom-control-indicator-checked-color: $component-active-color !default; $custom-control-indicator-checked-bg: $component-active-bg !default; $custom-control-indicator-checked-disabled-bg: rgba(theme-color("primary"), .5) !default; -$custom-control-indicator-checked-box-shadow: none !default; +$custom-control-indicator-checked-box-shadow: null !default; $custom-control-indicator-checked-border-color: $custom-control-indicator-checked-bg !default; $custom-control-indicator-focus-box-shadow: $input-focus-box-shadow !default; @@ -554,7 +548,7 @@ $custom-control-indicator-focus-border-color: $input-focus-border-color !defau $custom-control-indicator-active-color: $component-active-color !default; $custom-control-indicator-active-bg: lighten($component-active-bg, 35%) !default; -$custom-control-indicator-active-box-shadow: none !default; +$custom-control-indicator-active-box-shadow: null !default; $custom-control-indicator-active-border-color: $custom-control-indicator-active-bg !default; $custom-checkbox-indicator-border-radius: $border-radius !default; @@ -563,7 +557,7 @@ $custom-checkbox-indicator-icon-checked: url("data:image/svg+xml,<svg xml $custom-checkbox-indicator-indeterminate-bg: $component-active-bg !default; $custom-checkbox-indicator-indeterminate-color: $custom-control-indicator-checked-color !default; $custom-checkbox-indicator-icon-indeterminate: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'><path stroke='#{$custom-checkbox-indicator-indeterminate-color}' d='M0 2h4'/></svg>") !default; -$custom-checkbox-indicator-indeterminate-box-shadow: none !default; +$custom-checkbox-indicator-indeterminate-box-shadow: null !default; $custom-checkbox-indicator-indeterminate-border-color: $custom-checkbox-indicator-indeterminate-bg !default; $custom-radio-indicator-border-radius: 50% !default; @@ -668,7 +662,6 @@ $form-feedback-icon-invalid-color: $form-feedback-invalid-color !default; $form-feedback-icon-invalid: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='#{$form-feedback-icon-invalid-color}' viewBox='0 0 12 12'><circle cx='6' cy='6' r='4.5'/><path stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/><circle cx='6' cy='8.2' r='.6' fill='#{$form-feedback-icon-invalid-color}' stroke='none'/></svg>") !default; $form-validation-states: () !default; -// stylelint-disable-next-line scss/dollar-variable-default $form-validation-states: map-merge( ( "valid": ( diff --git a/vendor/twbs/bootstrap/scss/bootstrap-grid.scss b/vendor/twbs/bootstrap/scss/bootstrap-grid.scss index 4109e4fbd..06c9e2c4b 100644 --- a/vendor/twbs/bootstrap/scss/bootstrap-grid.scss +++ b/vendor/twbs/bootstrap/scss/bootstrap-grid.scss @@ -1,8 +1,8 @@ /*! - * Bootstrap Grid v4.5.0 (https://getbootstrap.com/) + * Bootstrap Grid v4.5.2 (https://getbootstrap.com/) * Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2020 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ html { diff --git a/vendor/twbs/bootstrap/scss/bootstrap-reboot.scss b/vendor/twbs/bootstrap/scss/bootstrap-reboot.scss index e61235ac6..d922d75fb 100644 --- a/vendor/twbs/bootstrap/scss/bootstrap-reboot.scss +++ b/vendor/twbs/bootstrap/scss/bootstrap-reboot.scss @@ -1,8 +1,8 @@ /*! - * Bootstrap Reboot v4.5.0 (https://getbootstrap.com/) + * Bootstrap Reboot v4.5.2 (https://getbootstrap.com/) * Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2020 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md) */ diff --git a/vendor/twbs/bootstrap/scss/bootstrap.scss b/vendor/twbs/bootstrap/scss/bootstrap.scss index 8ae96deb9..4d6521c0b 100644 --- a/vendor/twbs/bootstrap/scss/bootstrap.scss +++ b/vendor/twbs/bootstrap/scss/bootstrap.scss @@ -1,8 +1,8 @@ /*! - * Bootstrap v4.5.0 (https://getbootstrap.com/) + * Bootstrap v4.5.2 (https://getbootstrap.com/) * Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2020 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ @import "functions"; diff --git a/vendor/twbs/bootstrap/scss/mixins/_forms.scss b/vendor/twbs/bootstrap/scss/mixins/_forms.scss index 57c2d79f2..39b52f3ca 100644 --- a/vendor/twbs/bootstrap/scss/mixins/_forms.scss +++ b/vendor/twbs/bootstrap/scss/mixins/_forms.scss @@ -53,6 +53,7 @@ .#{$state}-tooltip { position: absolute; top: 100%; + left: 0; z-index: 5; display: none; max-width: 100%; // Contain to parent when possible diff --git a/vendor/twbs/bootstrap/scss/mixins/_grid-framework.scss b/vendor/twbs/bootstrap/scss/mixins/_grid-framework.scss index 191fb5650..6fc8e8561 100644 --- a/vendor/twbs/bootstrap/scss/mixins/_grid-framework.scss +++ b/vendor/twbs/bootstrap/scss/mixins/_grid-framework.scss @@ -34,7 +34,6 @@ .col#{$infix} { flex-basis: 0; flex-grow: 1; - min-width: 0; // See https://github.com/twbs/bootstrap/issues/25410 max-width: 100%; } diff --git a/vendor/twbs/bootstrap/scss/mixins/_grid.scss b/vendor/twbs/bootstrap/scss/mixins/_grid.scss index b1240b01f..b72d150e4 100644 --- a/vendor/twbs/bootstrap/scss/mixins/_grid.scss +++ b/vendor/twbs/bootstrap/scss/mixins/_grid.scss @@ -10,6 +10,12 @@ margin-left: auto; } +@mixin make-row($gutter: $grid-gutter-width) { + display: flex; + flex-wrap: wrap; + margin-right: -$gutter / 2; + margin-left: -$gutter / 2; +} // For each breakpoint, define the maximum width of the container in a media query @mixin make-container-max-widths($max-widths: $container-max-widths, $breakpoints: $grid-breakpoints) { @@ -18,13 +24,7 @@ max-width: $container-max-width; } } -} - -@mixin make-row($gutter: $grid-gutter-width) { - display: flex; - flex-wrap: wrap; - margin-right: -$gutter / 2; - margin-left: -$gutter / 2; + @include deprecate("The `make-container-max-widths` mixin", "v4.5.2", "v5"); } @mixin make-col-ready($gutter: $grid-gutter-width) { diff --git a/vendor/twbs/bootstrap/scss/utilities/_text.scss b/vendor/twbs/bootstrap/scss/utilities/_text.scss index d2b2a22ed..5d0f1c845 100644 --- a/vendor/twbs/bootstrap/scss/utilities/_text.scss +++ b/vendor/twbs/bootstrap/scss/utilities/_text.scss @@ -63,7 +63,8 @@ .text-decoration-none { text-decoration: none !important; } .text-break { - word-wrap: break-word !important; + word-break: break-word !important; // IE & < Edge 18 + overflow-wrap: break-word !important; } // Reset |