From f3b4308cb59bf4b21ff186f8479c82239446d139 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 7 Jun 2021 12:56:27 +0200 Subject: upgrade to bootstrap 5.0.1 and first batch of fixes --- vendor/twbs/bootstrap/scss/_alert.scss | 25 +- vendor/twbs/bootstrap/scss/_badge.scss | 29 +- vendor/twbs/bootstrap/scss/_breadcrumb.scss | 20 +- vendor/twbs/bootstrap/scss/_button-group.scss | 66 +- vendor/twbs/bootstrap/scss/_buttons.scss | 89 +- vendor/twbs/bootstrap/scss/_card.scss | 111 +- vendor/twbs/bootstrap/scss/_carousel.scss | 98 +- vendor/twbs/bootstrap/scss/_close.scss | 60 +- vendor/twbs/bootstrap/scss/_code.scss | 48 - vendor/twbs/bootstrap/scss/_custom-forms.scss | 526 -------- vendor/twbs/bootstrap/scss/_dropdown.scss | 120 +- vendor/twbs/bootstrap/scss/_forms.scss | 356 +----- vendor/twbs/bootstrap/scss/_functions.scss | 107 +- vendor/twbs/bootstrap/scss/_grid.scss | 57 +- vendor/twbs/bootstrap/scss/_input-group.scss | 208 ---- vendor/twbs/bootstrap/scss/_jumbotron.scss | 17 - vendor/twbs/bootstrap/scss/_list-group.scss | 36 +- vendor/twbs/bootstrap/scss/_media.scss | 8 - vendor/twbs/bootstrap/scss/_mixins.scss | 21 +- vendor/twbs/bootstrap/scss/_modal.scss | 111 +- vendor/twbs/bootstrap/scss/_nav.scss | 27 +- vendor/twbs/bootstrap/scss/_navbar.scss | 116 +- vendor/twbs/bootstrap/scss/_pagination.scss | 30 +- vendor/twbs/bootstrap/scss/_popover.scss | 42 +- vendor/twbs/bootstrap/scss/_print.scss | 141 --- vendor/twbs/bootstrap/scss/_progress.scss | 9 +- vendor/twbs/bootstrap/scss/_reboot.scss | 495 +++++--- vendor/twbs/bootstrap/scss/_root.scss | 13 +- vendor/twbs/bootstrap/scss/_spinners.scss | 18 +- vendor/twbs/bootstrap/scss/_tables.scss | 194 ++- vendor/twbs/bootstrap/scss/_toasts.scss | 35 +- vendor/twbs/bootstrap/scss/_tooltip.scss | 34 +- vendor/twbs/bootstrap/scss/_transitions.scss | 3 +- vendor/twbs/bootstrap/scss/_type.scss | 97 +- vendor/twbs/bootstrap/scss/_utilities.scss | 612 +++++++++- vendor/twbs/bootstrap/scss/_variables.scss | 1282 ++++++++++++-------- vendor/twbs/bootstrap/scss/bootstrap-grid.scss | 67 +- vendor/twbs/bootstrap/scss/bootstrap-reboot.scss | 5 +- vendor/twbs/bootstrap/scss/bootstrap.scss | 24 +- vendor/twbs/bootstrap/scss/mixins/_alert.scss | 8 +- .../bootstrap/scss/mixins/_background-variant.scss | 23 - vendor/twbs/bootstrap/scss/mixins/_badge.scss | 17 - .../twbs/bootstrap/scss/mixins/_border-radius.scss | 18 +- vendor/twbs/bootstrap/scss/mixins/_box-shadow.scss | 16 +- .../twbs/bootstrap/scss/mixins/_breakpoints.scss | 24 +- vendor/twbs/bootstrap/scss/mixins/_buttons.scss | 119 +- vendor/twbs/bootstrap/scss/mixins/_caret.scss | 18 +- vendor/twbs/bootstrap/scss/mixins/_clearfix.scss | 2 + vendor/twbs/bootstrap/scss/mixins/_float.scss | 14 - vendor/twbs/bootstrap/scss/mixins/_forms.scss | 125 +- vendor/twbs/bootstrap/scss/mixins/_gradients.scss | 24 +- .../bootstrap/scss/mixins/_grid-framework.scss | 80 -- vendor/twbs/bootstrap/scss/mixins/_grid.scss | 122 +- vendor/twbs/bootstrap/scss/mixins/_hover.scss | 37 - vendor/twbs/bootstrap/scss/mixins/_image.scss | 22 +- vendor/twbs/bootstrap/scss/mixins/_list-group.scss | 7 +- vendor/twbs/bootstrap/scss/mixins/_lists.scss | 2 +- .../twbs/bootstrap/scss/mixins/_nav-divider.scss | 11 - vendor/twbs/bootstrap/scss/mixins/_pagination.scss | 25 +- vendor/twbs/bootstrap/scss/mixins/_reset-text.scss | 4 +- .../twbs/bootstrap/scss/mixins/_screen-reader.scss | 34 - vendor/twbs/bootstrap/scss/mixins/_size.scss | 7 - vendor/twbs/bootstrap/scss/mixins/_table-row.scss | 39 - .../twbs/bootstrap/scss/mixins/_text-emphasis.scss | 17 - vendor/twbs/bootstrap/scss/mixins/_text-hide.scss | 11 - vendor/twbs/bootstrap/scss/mixins/_transition.scss | 2 +- vendor/twbs/bootstrap/scss/mixins/_visibility.scss | 8 - vendor/twbs/bootstrap/scss/utilities/_align.scss | 8 - .../twbs/bootstrap/scss/utilities/_background.scss | 19 - vendor/twbs/bootstrap/scss/utilities/_borders.scss | 75 -- .../twbs/bootstrap/scss/utilities/_clearfix.scss | 3 - vendor/twbs/bootstrap/scss/utilities/_display.scss | 26 - vendor/twbs/bootstrap/scss/utilities/_embed.scss | 39 - vendor/twbs/bootstrap/scss/utilities/_flex.scss | 51 - vendor/twbs/bootstrap/scss/utilities/_float.scss | 11 - .../bootstrap/scss/utilities/_interactions.scss | 5 - .../twbs/bootstrap/scss/utilities/_overflow.scss | 5 - .../twbs/bootstrap/scss/utilities/_position.scss | 32 - .../bootstrap/scss/utilities/_screenreaders.scss | 11 - vendor/twbs/bootstrap/scss/utilities/_shadows.scss | 6 - vendor/twbs/bootstrap/scss/utilities/_sizing.scss | 20 - vendor/twbs/bootstrap/scss/utilities/_spacing.scss | 73 -- .../bootstrap/scss/utilities/_stretched-link.scss | 19 - vendor/twbs/bootstrap/scss/utilities/_text.scss | 72 -- .../twbs/bootstrap/scss/utilities/_visibility.scss | 13 - vendor/twbs/bootstrap/scss/vendor/_rfs.scss | 360 ++++-- 86 files changed, 3020 insertions(+), 4021 deletions(-) delete mode 100644 vendor/twbs/bootstrap/scss/_code.scss delete mode 100644 vendor/twbs/bootstrap/scss/_custom-forms.scss delete mode 100644 vendor/twbs/bootstrap/scss/_input-group.scss delete mode 100644 vendor/twbs/bootstrap/scss/_jumbotron.scss delete mode 100644 vendor/twbs/bootstrap/scss/_media.scss delete mode 100644 vendor/twbs/bootstrap/scss/_print.scss delete mode 100644 vendor/twbs/bootstrap/scss/mixins/_background-variant.scss delete mode 100644 vendor/twbs/bootstrap/scss/mixins/_badge.scss delete mode 100644 vendor/twbs/bootstrap/scss/mixins/_float.scss delete mode 100644 vendor/twbs/bootstrap/scss/mixins/_grid-framework.scss delete mode 100644 vendor/twbs/bootstrap/scss/mixins/_hover.scss delete mode 100644 vendor/twbs/bootstrap/scss/mixins/_nav-divider.scss delete mode 100644 vendor/twbs/bootstrap/scss/mixins/_screen-reader.scss delete mode 100644 vendor/twbs/bootstrap/scss/mixins/_size.scss delete mode 100644 vendor/twbs/bootstrap/scss/mixins/_table-row.scss delete mode 100644 vendor/twbs/bootstrap/scss/mixins/_text-emphasis.scss delete mode 100644 vendor/twbs/bootstrap/scss/mixins/_text-hide.scss delete mode 100644 vendor/twbs/bootstrap/scss/mixins/_visibility.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_align.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_background.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_borders.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_clearfix.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_display.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_embed.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_flex.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_float.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_interactions.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_overflow.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_position.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_screenreaders.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_shadows.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_sizing.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_spacing.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_stretched-link.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_text.scss delete mode 100644 vendor/twbs/bootstrap/scss/utilities/_visibility.scss (limited to 'vendor/twbs/bootstrap/scss') diff --git a/vendor/twbs/bootstrap/scss/_alert.scss b/vendor/twbs/bootstrap/scss/_alert.scss index 4aa1fc203..34f1e84ed 100644 --- a/vendor/twbs/bootstrap/scss/_alert.scss +++ b/vendor/twbs/bootstrap/scss/_alert.scss @@ -27,26 +27,31 @@ // Expand the right padding and account for the close button's positioning. .alert-dismissible { - padding-right: $close-font-size + $alert-padding-x * 2; + padding-right: $alert-dismissible-padding-r; // Adjust close link position - .close { + .btn-close { position: absolute; top: 0; right: 0; - z-index: 2; - padding: $alert-padding-y $alert-padding-x; - color: inherit; + z-index: $stretched-link-z-index + 1; + padding: $alert-padding-y * 1.25 $alert-padding-x; } } -// Alternate styles -// +// scss-docs-start alert-modifiers // Generate contextual modifier classes for colorizing the alert. -@each $color, $value in $theme-colors { - .alert-#{$color} { - @include alert-variant(theme-color-level($color, $alert-bg-level), theme-color-level($color, $alert-border-level), theme-color-level($color, $alert-color-level)); +@each $state, $value in $theme-colors { + $alert-background: shift-color($value, $alert-bg-scale); + $alert-border: shift-color($value, $alert-border-scale); + $alert-color: shift-color($value, $alert-color-scale); + @if (contrast-ratio($alert-background, $alert-color) < $min-contrast-ratio) { + $alert-color: mix($value, color-contrast($alert-background), abs($alert-color-scale)); + } + .alert-#{$state} { + @include alert-variant($alert-background, $alert-border, $alert-color); } } +// scss-docs-end alert-modifiers diff --git a/vendor/twbs/bootstrap/scss/_badge.scss b/vendor/twbs/bootstrap/scss/_badge.scss index 42c5d08d7..08df1b84a 100644 --- a/vendor/twbs/bootstrap/scss/_badge.scss +++ b/vendor/twbs/bootstrap/scss/_badge.scss @@ -9,17 +9,12 @@ @include font-size($badge-font-size); font-weight: $badge-font-weight; line-height: 1; + color: $badge-color; text-align: center; white-space: nowrap; vertical-align: baseline; @include border-radius($badge-border-radius); - @include transition($badge-transition); - - @at-root a#{&} { - @include hover-focus() { - text-decoration: none; - } - } + @include gradient-bg(); // Empty badges collapse automatically &:empty { @@ -32,23 +27,3 @@ position: relative; top: -1px; } - -// Pill badges -// -// Make them extra rounded with a modifier to replace v3's badges. - -.badge-pill { - padding-right: $badge-pill-padding-x; - padding-left: $badge-pill-padding-x; - @include border-radius($badge-pill-border-radius); -} - -// Colors -// -// Contextual variations (linked badges get darker on :hover). - -@each $color, $value in $theme-colors { - .badge-#{$color} { - @include badge-variant($value); - } -} diff --git a/vendor/twbs/bootstrap/scss/_breadcrumb.scss b/vendor/twbs/bootstrap/scss/_breadcrumb.scss index 9c204c7d5..f7fafe743 100644 --- a/vendor/twbs/bootstrap/scss/_breadcrumb.scss +++ b/vendor/twbs/bootstrap/scss/_breadcrumb.scss @@ -12,30 +12,16 @@ .breadcrumb-item { // The separator between breadcrumbs (by default, a forward-slash: "/") + .breadcrumb-item { - padding-left: $breadcrumb-item-padding; + padding-left: $breadcrumb-item-padding-x; &::before { float: left; // Suppress inline spacings and underlining of the separator - padding-right: $breadcrumb-item-padding; + padding-right: $breadcrumb-item-padding-x; color: $breadcrumb-divider-color; - content: escape-svg($breadcrumb-divider); + content: var(--#{$variable-prefix}breadcrumb-divider, escape-svg($breadcrumb-divider)) #{"/* rtl:"} var(--#{$variable-prefix}breadcrumb-divider, escape-svg($breadcrumb-divider-flipped)) #{"*/"}; } } - // IE9-11 hack to properly handle hyperlink underlines for breadcrumbs built - // without `