From ccd826f63a7a4c7e442fab8a70d9c4c84808b417 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 11 Oct 2022 18:29:06 +0000 Subject: Revert "update composer libs" This reverts commit 5e5f0aa955d86743a14531bed98501b59140ab1f. --- vendor/twbs/bootstrap/scss/_accordion.scss | 11 +++---- vendor/twbs/bootstrap/scss/_button-group.scss | 2 +- vendor/twbs/bootstrap/scss/_buttons.scss | 35 +++++----------------- vendor/twbs/bootstrap/scss/_dropdown.scss | 3 +- vendor/twbs/bootstrap/scss/_functions.scss | 2 +- vendor/twbs/bootstrap/scss/_list-group.scss | 11 ++++--- vendor/twbs/bootstrap/scss/_modal.scss | 2 +- vendor/twbs/bootstrap/scss/_nav.scss | 4 +-- vendor/twbs/bootstrap/scss/_navbar.scss | 2 -- vendor/twbs/bootstrap/scss/_offcanvas.scss | 9 +++--- vendor/twbs/bootstrap/scss/_pagination.scss | 2 +- vendor/twbs/bootstrap/scss/_popover.scss | 10 +++---- vendor/twbs/bootstrap/scss/_toasts.scss | 7 ++--- vendor/twbs/bootstrap/scss/_variables.scss | 35 +++++++++++----------- .../bootstrap/scss/forms/_floating-labels.scss | 1 - vendor/twbs/bootstrap/scss/forms/_input-group.scss | 11 +++---- vendor/twbs/bootstrap/scss/mixins/_banner.scss | 4 +-- vendor/twbs/bootstrap/scss/mixins/_forms.scss | 20 ++++++------- .../bootstrap/scss/mixins/_table-variants.scss | 4 +-- vendor/twbs/bootstrap/scss/mixins/_utilities.scss | 2 +- 20 files changed, 70 insertions(+), 107 deletions(-) (limited to 'vendor/twbs/bootstrap/scss') diff --git a/vendor/twbs/bootstrap/scss/_accordion.scss b/vendor/twbs/bootstrap/scss/_accordion.scss index f09601bab..b306540d7 100644 --- a/vendor/twbs/bootstrap/scss/_accordion.scss +++ b/vendor/twbs/bootstrap/scss/_accordion.scss @@ -4,7 +4,7 @@ .accordion { // scss-docs-start accordion-css-vars - --#{$prefix}accordion-color: #{$accordion-color}; + --#{$prefix}accordion-color: #{color-contrast($accordion-bg)}; --#{$prefix}accordion-bg: #{$accordion-bg}; --#{$prefix}accordion-transition: #{$accordion-transition}; --#{$prefix}accordion-border-color: #{$accordion-border-color}; @@ -13,7 +13,7 @@ --#{$prefix}accordion-inner-border-radius: #{$accordion-inner-border-radius}; --#{$prefix}accordion-btn-padding-x: #{$accordion-button-padding-x}; --#{$prefix}accordion-btn-padding-y: #{$accordion-button-padding-y}; - --#{$prefix}accordion-btn-color: #{$accordion-button-color}; + --#{$prefix}accordion-btn-color: #{$accordion-color}; --#{$prefix}accordion-btn-bg: #{$accordion-button-bg}; --#{$prefix}accordion-btn-icon: #{escape-svg($accordion-button-icon)}; --#{$prefix}accordion-btn-icon-width: #{$accordion-icon-width}; @@ -47,7 +47,7 @@ &:not(.collapsed) { color: var(--#{$prefix}accordion-active-color); background-color: var(--#{$prefix}accordion-active-bg); - box-shadow: inset 0 calc(-1 * var(--#{$prefix}accordion-border-width)) 0 var(--#{$prefix}accordion-border-color); // stylelint-disable-line function-disallowed-list + box-shadow: inset 0 calc(var(--#{$prefix}accordion-border-width) * -1) 0 var(--#{$prefix}accordion-border-color); // stylelint-disable-line function-disallowed-list &::after { background-image: var(--#{$prefix}accordion-btn-active-icon); @@ -140,10 +140,7 @@ &:last-child { border-bottom: 0; } .accordion-button { - &, - &.collapsed { - @include border-radius(0); - } + @include border-radius(0); } } } diff --git a/vendor/twbs/bootstrap/scss/_button-group.scss b/vendor/twbs/bootstrap/scss/_button-group.scss index 79b100cbf..f78b8c101 100644 --- a/vendor/twbs/bootstrap/scss/_button-group.scss +++ b/vendor/twbs/bootstrap/scss/_button-group.scss @@ -37,7 +37,7 @@ @include border-radius($btn-border-radius); // Prevent double borders when buttons are next to each other - > :not(.btn-check:first-child) + .btn, + > .btn:not(:first-child), > .btn-group:not(:first-child) { margin-left: -$btn-border-width; } diff --git a/vendor/twbs/bootstrap/scss/_buttons.scss b/vendor/twbs/bootstrap/scss/_buttons.scss index f2c4c13a9..044b8d6f5 100644 --- a/vendor/twbs/bootstrap/scss/_buttons.scss +++ b/vendor/twbs/bootstrap/scss/_buttons.scss @@ -15,7 +15,6 @@ --#{$prefix}btn-border-width: #{$btn-border-width}; --#{$prefix}btn-border-color: transparent; --#{$prefix}btn-border-radius: #{$btn-border-radius}; - --#{$prefix}btn-hover-border-color: transparent; --#{$prefix}btn-box-shadow: #{$btn-box-shadow}; --#{$prefix}btn-disabled-opacity: #{$btn-disabled-opacity}; --#{$prefix}btn-focus-box-shadow: 0 0 0 #{$btn-focus-width} rgba(var(--#{$prefix}btn-focus-shadow-rgb), .5); @@ -47,14 +46,8 @@ border-color: var(--#{$prefix}btn-hover-border-color); } - .btn-check + &:hover { - // override for the checkbox/radio buttons - color: var(--#{$prefix}btn-color); - background-color: var(--#{$prefix}btn-bg); - border-color: var(--#{$prefix}btn-border-color); - } - - &:focus-visible { + .btn-check:focus + &, + &:focus { color: var(--#{$prefix}btn-hover-color); @include gradient-bg(var(--#{$prefix}btn-hover-bg)); border-color: var(--#{$prefix}btn-hover-border-color); @@ -67,20 +60,9 @@ } } - .btn-check:focus-visible + & { - border-color: var(--#{$prefix}btn-hover-border-color); - outline: 0; - // Avoid using mixin so we can pass custom focus shadow properly - @if $enable-shadows { - box-shadow: var(--#{$prefix}btn-box-shadow), var(--#{$prefix}btn-focus-box-shadow); - } @else { - box-shadow: var(--#{$prefix}btn-focus-box-shadow); - } - } - .btn-check:checked + &, - :not(.btn-check) + &:active, - &:first-child:active, + .btn-check:active + &, + &:active, &.active, &.show { color: var(--#{$prefix}btn-active-color); @@ -90,7 +72,7 @@ border-color: var(--#{$prefix}btn-active-border-color); @include box-shadow(var(--#{$prefix}btn-active-shadow)); - &:focus-visible { + &:focus { // Avoid using mixin so we can pass custom focus shadow properly @if $enable-shadows { box-shadow: var(--#{$prefix}btn-active-shadow), var(--#{$prefix}btn-focus-box-shadow); @@ -173,16 +155,13 @@ --#{$prefix}btn-focus-shadow-rgb: #{to-rgb(mix(color-contrast($primary), $primary, 15%))}; text-decoration: $link-decoration; - @if $enable-gradients { - background-image: none; - } &:hover, - &:focus-visible { + &:focus { text-decoration: $link-hover-decoration; } - &:focus-visible { + &:focus { color: var(--#{$prefix}btn-color); } diff --git a/vendor/twbs/bootstrap/scss/_dropdown.scss b/vendor/twbs/bootstrap/scss/_dropdown.scss index 8899d25a0..62125b967 100644 --- a/vendor/twbs/bootstrap/scss/_dropdown.scss +++ b/vendor/twbs/bootstrap/scss/_dropdown.scss @@ -18,7 +18,6 @@ // The dropdown menu .dropdown-menu { // scss-docs-start dropdown-css-vars - --#{$prefix}dropdown-zindex: #{$zindex-dropdown}; --#{$prefix}dropdown-min-width: #{$dropdown-min-width}; --#{$prefix}dropdown-padding-x: #{$dropdown-padding-x}; --#{$prefix}dropdown-padding-y: #{$dropdown-padding-y}; @@ -47,7 +46,7 @@ // scss-docs-end dropdown-css-vars position: absolute; - z-index: var(--#{$prefix}dropdown-zindex); + z-index: $zindex-dropdown; display: none; // none by default, but block on "open" of the menu min-width: var(--#{$prefix}dropdown-min-width); padding: var(--#{$prefix}dropdown-padding-y) var(--#{$prefix}dropdown-padding-x); diff --git a/vendor/twbs/bootstrap/scss/_functions.scss b/vendor/twbs/bootstrap/scss/_functions.scss index 969a4b08b..855768bef 100644 --- a/vendor/twbs/bootstrap/scss/_functions.scss +++ b/vendor/twbs/bootstrap/scss/_functions.scss @@ -109,7 +109,7 @@ // Replace `$search` with `$replace` in `$string` // Used on our SVG icon backgrounds for custom forms. // -// @author Kitty Giraudel +// @author Hugo Giraudel // @param {String} $string - Initial string // @param {String} $search - Substring to replace // @param {String} $replace ('') - New value diff --git a/vendor/twbs/bootstrap/scss/_list-group.scss b/vendor/twbs/bootstrap/scss/_list-group.scss index c0ec16468..22546ccb5 100644 --- a/vendor/twbs/bootstrap/scss/_list-group.scss +++ b/vendor/twbs/bootstrap/scss/_list-group.scss @@ -104,12 +104,11 @@ border-color: var(--#{$prefix}list-group-active-border-color); } - // stylelint-disable-next-line scss/selector-no-redundant-nesting-selector - & + .list-group-item { + & + & { border-top-width: 0; &.active { - margin-top: calc(-1 * var(--#{$prefix}list-group-border-width)); // stylelint-disable-line function-disallowed-list + margin-top: calc(var(--#{$prefix}list-group-border-width) * -1); // stylelint-disable-line function-disallowed-list border-top-width: var(--#{$prefix}list-group-border-width); } } @@ -127,12 +126,12 @@ flex-direction: row; > .list-group-item { - &:first-child:not(:last-child) { + &:first-child { @include border-bottom-start-radius(var(--#{$prefix}list-group-border-radius)); @include border-top-end-radius(0); } - &:last-child:not(:first-child) { + &:last-child { @include border-top-end-radius(var(--#{$prefix}list-group-border-radius)); @include border-bottom-start-radius(0); } @@ -146,7 +145,7 @@ border-left-width: 0; &.active { - margin-left: calc(-1 * var(--#{$prefix}list-group-border-width)); // stylelint-disable-line function-disallowed-list + margin-left: calc(var(--#{$prefix}list-group-border-width) * -1); // stylelint-disable-line function-disallowed-list border-left-width: var(--#{$prefix}list-group-border-width); } } diff --git a/vendor/twbs/bootstrap/scss/_modal.scss b/vendor/twbs/bootstrap/scss/_modal.scss index 5f1429fe4..a25af5741 100644 --- a/vendor/twbs/bootstrap/scss/_modal.scss +++ b/vendor/twbs/bootstrap/scss/_modal.scss @@ -133,7 +133,7 @@ .btn-close { padding: calc(var(--#{$prefix}modal-header-padding-y) * .5) calc(var(--#{$prefix}modal-header-padding-x) * .5); - margin: calc(-.5 * var(--#{$prefix}modal-header-padding-y)) calc(-.5 * var(--#{$prefix}modal-header-padding-x)) calc(-.5 * var(--#{$prefix}modal-header-padding-y)) auto; + margin: calc(var(--#{$prefix}modal-header-padding-y) * -.5) calc(var(--#{$prefix}modal-header-padding-x) * -.5) calc(var(--#{$prefix}modal-header-padding-y) * -.5) auto; } } diff --git a/vendor/twbs/bootstrap/scss/_nav.scss b/vendor/twbs/bootstrap/scss/_nav.scss index 9efc03bc8..e96b273fb 100644 --- a/vendor/twbs/bootstrap/scss/_nav.scss +++ b/vendor/twbs/bootstrap/scss/_nav.scss @@ -62,7 +62,7 @@ border-bottom: var(--#{$prefix}nav-tabs-border-width) solid var(--#{$prefix}nav-tabs-border-color); .nav-link { - margin-bottom: calc(-1 * var(--#{$prefix}nav-tabs-border-width)); // stylelint-disable-line function-disallowed-list + margin-bottom: calc(var(--#{$prefix}nav-tabs-border-width) * -1); // stylelint-disable-line function-disallowed-list background: none; border: var(--#{$prefix}nav-tabs-border-width) solid transparent; @include border-top-radius(var(--#{$prefix}nav-tabs-border-radius)); @@ -91,7 +91,7 @@ .dropdown-menu { // Make dropdown border overlap tab border - margin-top: calc(-1 * var(--#{$prefix}nav-tabs-border-width)); // stylelint-disable-line function-disallowed-list + margin-top: calc(var(--#{$prefix}nav-tabs-border-width) * -1); // stylelint-disable-line function-disallowed-list // Remove the top rounded corners here since there is a hard edge above the menu @include border-top-radius(0); } diff --git a/vendor/twbs/bootstrap/scss/_navbar.scss b/vendor/twbs/bootstrap/scss/_navbar.scss index 599b055eb..fd6603d42 100644 --- a/vendor/twbs/bootstrap/scss/_navbar.scss +++ b/vendor/twbs/bootstrap/scss/_navbar.scss @@ -265,7 +265,6 @@ } .navbar-dark { - // scss-docs-start navbar-dark-css-vars --#{$prefix}navbar-color: #{$navbar-dark-color}; --#{$prefix}navbar-hover-color: #{$navbar-dark-hover-color}; --#{$prefix}navbar-disabled-color: #{$navbar-dark-disabled-color}; @@ -274,5 +273,4 @@ --#{$prefix}navbar-brand-hover-color: #{$navbar-dark-brand-hover-color}; --#{$prefix}navbar-toggler-border-color: #{$navbar-dark-toggler-border-color}; --#{$prefix}navbar-toggler-icon-bg: #{escape-svg($navbar-dark-toggler-icon-bg)}; - // scss-docs-end navbar-dark-css-vars } diff --git a/vendor/twbs/bootstrap/scss/_offcanvas.scss b/vendor/twbs/bootstrap/scss/_offcanvas.scss index 23fc357f2..5709479dc 100644 --- a/vendor/twbs/bootstrap/scss/_offcanvas.scss +++ b/vendor/twbs/bootstrap/scss/_offcanvas.scss @@ -2,7 +2,6 @@ %offcanvas-css-vars { // scss-docs-start offcanvas-css-vars - --#{$prefix}offcanvas-zindex: #{$zindex-offcanvas}; --#{$prefix}offcanvas-width: #{$offcanvas-horizontal-width}; --#{$prefix}offcanvas-height: #{$offcanvas-vertical-height}; --#{$prefix}offcanvas-padding-x: #{$offcanvas-padding-x}; @@ -32,7 +31,7 @@ @include media-breakpoint-down($next) { position: fixed; bottom: 0; - z-index: var(--#{$prefix}offcanvas-zindex); + z-index: $zindex-offcanvas; display: flex; flex-direction: column; max-width: 100%; @@ -126,9 +125,9 @@ .btn-close { padding: calc(var(--#{$prefix}offcanvas-padding-y) * .5) calc(var(--#{$prefix}offcanvas-padding-x) * .5); - margin-top: calc(-.5 * var(--#{$prefix}offcanvas-padding-y)); - margin-right: calc(-.5 * var(--#{$prefix}offcanvas-padding-x)); - margin-bottom: calc(-.5 * var(--#{$prefix}offcanvas-padding-y)); + margin-top: calc(var(--#{$prefix}offcanvas-padding-y) * -.5); + margin-right: calc(var(--#{$prefix}offcanvas-padding-x) * -.5); + margin-bottom: calc(var(--#{$prefix}offcanvas-padding-y) * -.5); } } diff --git a/vendor/twbs/bootstrap/scss/_pagination.scss b/vendor/twbs/bootstrap/scss/_pagination.scss index cf4db3c36..e8e10a6d6 100644 --- a/vendor/twbs/bootstrap/scss/_pagination.scss +++ b/vendor/twbs/bootstrap/scss/_pagination.scss @@ -75,7 +75,7 @@ margin-left: $pagination-margin-start; } - @if $pagination-margin-start == ($pagination-border-width * -1) { + @if $pagination-margin-start == (calc($pagination-border-width * -1)) { &:first-child { .page-link { @include border-start-radius(var(--#{$prefix}pagination-border-radius)); diff --git a/vendor/twbs/bootstrap/scss/_popover.scss b/vendor/twbs/bootstrap/scss/_popover.scss index 7b69f6232..b00c02959 100644 --- a/vendor/twbs/bootstrap/scss/_popover.scss +++ b/vendor/twbs/bootstrap/scss/_popover.scss @@ -56,7 +56,7 @@ .bs-popover-top { > .popover-arrow { - bottom: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list + bottom: calc((var(--#{$prefix}popover-arrow-height) * -1) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list &::before, &::after { @@ -78,7 +78,7 @@ /* rtl:begin:ignore */ .bs-popover-end { > .popover-arrow { - left: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list + left: calc((var(--#{$prefix}popover-arrow-height) * -1) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list width: var(--#{$prefix}popover-arrow-height); height: var(--#{$prefix}popover-arrow-width); @@ -103,7 +103,7 @@ .bs-popover-bottom { > .popover-arrow { - top: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list + top: calc((var(--#{$prefix}popover-arrow-height) * -1) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list &::before, &::after { @@ -128,7 +128,7 @@ left: 50%; display: block; width: var(--#{$prefix}popover-arrow-width); - margin-left: calc(-.5 * var(--#{$prefix}popover-arrow-width)); // stylelint-disable-line function-disallowed-list + margin-left: calc(var(--#{$prefix}popover-arrow-width) * -.5); // stylelint-disable-line function-disallowed-list content: ""; border-bottom: var(--#{$prefix}popover-border-width) solid var(--#{$prefix}popover-header-bg); } @@ -137,7 +137,7 @@ /* rtl:begin:ignore */ .bs-popover-start { > .popover-arrow { - right: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list + right: calc((var(--#{$prefix}popover-arrow-height) * -1) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list width: var(--#{$prefix}popover-arrow-height); height: var(--#{$prefix}popover-arrow-width); diff --git a/vendor/twbs/bootstrap/scss/_toasts.scss b/vendor/twbs/bootstrap/scss/_toasts.scss index 2ce378d5b..68ed8ab7c 100644 --- a/vendor/twbs/bootstrap/scss/_toasts.scss +++ b/vendor/twbs/bootstrap/scss/_toasts.scss @@ -1,6 +1,5 @@ .toast { // scss-docs-start toast-css-vars - --#{$prefix}toast-zindex: #{$zindex-toast}; --#{$prefix}toast-padding-x: #{$toast-padding-x}; --#{$prefix}toast-padding-y: #{$toast-padding-y}; --#{$prefix}toast-spacing: #{$toast-spacing}; @@ -38,10 +37,8 @@ } .toast-container { - --#{$prefix}toast-zindex: #{$zindex-toast}; - position: absolute; - z-index: var(--#{$prefix}toast-zindex); + z-index: $zindex-toast; width: max-content; max-width: 100%; pointer-events: none; @@ -62,7 +59,7 @@ @include border-top-radius(calc(var(--#{$prefix}toast-border-radius) - var(--#{$prefix}toast-border-width))); .btn-close { - margin-right: calc(-.5 * var(--#{$prefix}toast-padding-x)); // stylelint-disable-line function-disallowed-list + margin-right: calc(var(--#{$prefix}toast-padding-x) * -.5); // stylelint-disable-line function-disallowed-list margin-left: var(--#{$prefix}toast-padding-x); } } diff --git a/vendor/twbs/bootstrap/scss/_variables.scss b/vendor/twbs/bootstrap/scss/_variables.scss index e0218365b..304851063 100644 --- a/vendor/twbs/bootstrap/scss/_variables.scss +++ b/vendor/twbs/bootstrap/scss/_variables.scss @@ -1100,27 +1100,28 @@ $navbar-toggler-font-size: $font-size-lg !default; $navbar-toggler-border-radius: $btn-border-radius !default; $navbar-toggler-focus-width: $btn-focus-width !default; $navbar-toggler-transition: box-shadow .15s ease-in-out !default; - -$navbar-light-color: rgba($black, .55) !default; -$navbar-light-hover-color: rgba($black, .7) !default; -$navbar-light-active-color: rgba($black, .9) !default; -$navbar-light-disabled-color: rgba($black, .3) !default; -$navbar-light-toggler-icon-bg: url("data:image/svg+xml,") !default; -$navbar-light-toggler-border-color: rgba($black, .1) !default; -$navbar-light-brand-color: $navbar-light-active-color !default; -$navbar-light-brand-hover-color: $navbar-light-active-color !default; // scss-docs-end navbar-variables -// scss-docs-start navbar-dark-variables +// scss-docs-start navbar-theme-variables $navbar-dark-color: rgba($white, .55) !default; $navbar-dark-hover-color: rgba($white, .75) !default; $navbar-dark-active-color: $white !default; $navbar-dark-disabled-color: rgba($white, .25) !default; $navbar-dark-toggler-icon-bg: url("data:image/svg+xml,") !default; $navbar-dark-toggler-border-color: rgba($white, .1) !default; -$navbar-dark-brand-color: $navbar-dark-active-color !default; -$navbar-dark-brand-hover-color: $navbar-dark-active-color !default; -// scss-docs-end navbar-dark-variables + +$navbar-light-color: rgba($black, .55) !default; +$navbar-light-hover-color: rgba($black, .7) !default; +$navbar-light-active-color: rgba($black, .9) !default; +$navbar-light-disabled-color: rgba($black, .3) !default; +$navbar-light-toggler-icon-bg: url("data:image/svg+xml,") !default; +$navbar-light-toggler-border-color: rgba($black, .1) !default; + +$navbar-light-brand-color: $navbar-light-active-color !default; +$navbar-light-brand-hover-color: $navbar-light-active-color !default; +$navbar-dark-brand-color: $navbar-dark-active-color !default; +$navbar-dark-brand-hover-color: $navbar-dark-active-color !default; +// scss-docs-end navbar-theme-variables // Dropdowns @@ -1256,7 +1257,7 @@ $card-group-margin: $grid-gutter-width * .5 !default; // scss-docs-start accordion-variables $accordion-padding-y: 1rem !default; $accordion-padding-x: 1.25rem !default; -$accordion-color: $body-color !default; // Sass variable because of $accordion-button-icon +$accordion-color: var(--#{$prefix}body-color) !default; $accordion-bg: $body-bg !default; $accordion-border-width: $border-width !default; $accordion-border-color: var(--#{$prefix}border-color) !default; @@ -1332,7 +1333,7 @@ $popover-box-shadow: $box-shadow !default; $popover-header-font-size: $font-size-base !default; $popover-header-bg: shade-color($popover-bg, 6%) !default; -$popover-header-color: $headings-color !default; +$popover-header-color: var(--#{$prefix}heading-color) !default; $popover-header-padding-y: .5rem !default; $popover-header-padding-x: $spacer !default; @@ -1559,13 +1560,11 @@ $carousel-control-next-icon-bg: url("data:image/svg+xml,