From 32f2de17d4faeb7b74b0f1b46c43800e3acedf36 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 5 Oct 2023 10:17:07 +0000 Subject: composer update bootstrap --- vendor/twbs/bootstrap/scss/_buttons.scss | 2 +- vendor/twbs/bootstrap/scss/_nav.scss | 16 ++------- vendor/twbs/bootstrap/scss/_reboot.scss | 9 ++--- vendor/twbs/bootstrap/scss/_root.scss | 3 ++ vendor/twbs/bootstrap/scss/_utilities.scss | 6 ++-- vendor/twbs/bootstrap/scss/_variables-dark.scss | 4 ++- vendor/twbs/bootstrap/scss/_variables.scss | 38 ++++++++++++---------- .../bootstrap/scss/forms/_floating-labels.scss | 3 +- vendor/twbs/bootstrap/scss/forms/_form-check.scss | 3 +- .../twbs/bootstrap/scss/forms/_form-control.scss | 2 +- vendor/twbs/bootstrap/scss/forms/_form-range.scss | 6 ++-- vendor/twbs/bootstrap/scss/forms/_form-select.scss | 2 +- vendor/twbs/bootstrap/scss/helpers/_color-bg.scss | 3 +- vendor/twbs/bootstrap/scss/helpers/_vr.scss | 2 +- vendor/twbs/bootstrap/scss/mixins/_banner.scss | 2 +- vendor/twbs/bootstrap/scss/mixins/_grid.scss | 2 +- 16 files changed, 51 insertions(+), 52 deletions(-) (limited to 'vendor/twbs/bootstrap/scss') diff --git a/vendor/twbs/bootstrap/scss/_buttons.scss b/vendor/twbs/bootstrap/scss/_buttons.scss index cbc0784a4..e14a18438 100644 --- a/vendor/twbs/bootstrap/scss/_buttons.scss +++ b/vendor/twbs/bootstrap/scss/_buttons.scss @@ -170,7 +170,7 @@ --#{$prefix}btn-disabled-color: #{$btn-link-disabled-color}; --#{$prefix}btn-disabled-border-color: transparent; --#{$prefix}btn-box-shadow: 0 0 0 #000; // Can't use `none` as keyword negates all values when used with multiple shadows - --#{$prefix}btn-focus-shadow-rgb: #{to-rgb(mix(color-contrast($link-color), $link-color, 15%))}; + --#{$prefix}btn-focus-shadow-rgb: #{$btn-link-focus-shadow-rgb}; text-decoration: $link-decoration; @if $enable-gradients { diff --git a/vendor/twbs/bootstrap/scss/_nav.scss b/vendor/twbs/bootstrap/scss/_nav.scss index aedbdba54..ff073d361 100644 --- a/vendor/twbs/bootstrap/scss/_nav.scss +++ b/vendor/twbs/bootstrap/scss/_nav.scss @@ -44,7 +44,8 @@ } // Disabled state lightens text - &.disabled { + &.disabled, + &:disabled { color: var(--#{$prefix}nav-link-disabled-color); pointer-events: none; cursor: default; @@ -79,13 +80,6 @@ isolation: isolate; border-color: var(--#{$prefix}nav-tabs-link-hover-border-color); } - - &.disabled, - &:disabled { - color: var(--#{$prefix}nav-link-disabled-color); - background-color: transparent; - border-color: transparent; - } } .nav-link.active, @@ -117,12 +111,6 @@ .nav-link { @include border-radius(var(--#{$prefix}nav-pills-border-radius)); - - &:disabled { - color: var(--#{$prefix}nav-link-disabled-color); - background-color: transparent; - border-color: transparent; - } } .nav-link.active, diff --git a/vendor/twbs/bootstrap/scss/_reboot.scss b/vendor/twbs/bootstrap/scss/_reboot.scss index 4226ab894..18791753d 100644 --- a/vendor/twbs/bootstrap/scss/_reboot.scss +++ b/vendor/twbs/bootstrap/scss/_reboot.scss @@ -217,6 +217,7 @@ small { mark { padding: $mark-padding; + color: var(--#{$prefix}highlight-color); background-color: var(--#{$prefix}highlight-bg); } @@ -524,15 +525,15 @@ legend { height: auto; } -// 1. Correct the outline style in Safari. -// 2. This overrides the extra rounded corners on search inputs in iOS so that our +// 1. This overrides the extra rounded corners on search inputs in iOS so that our // `.form-control` class can properly style them. Note that this cannot simply // be added to `.form-control` as it's not specific enough. For details, see // https://github.com/twbs/bootstrap/issues/11586. +// 2. Correct the outline style in Safari. [type="search"] { - outline-offset: -2px; // 1 - -webkit-appearance: textfield; // 2 + -webkit-appearance: textfield; // 1 + outline-offset: -2px; // 2 } // 1. A few input types should stay LTR diff --git a/vendor/twbs/bootstrap/scss/_root.scss b/vendor/twbs/bootstrap/scss/_root.scss index ab720a38e..becddf14a 100644 --- a/vendor/twbs/bootstrap/scss/_root.scss +++ b/vendor/twbs/bootstrap/scss/_root.scss @@ -91,6 +91,7 @@ } --#{$prefix}code-color: #{$code-color}; + --#{$prefix}highlight-color: #{$mark-color}; --#{$prefix}highlight-bg: #{$mark-bg}; // scss-docs-start root-border-var @@ -171,6 +172,8 @@ --#{$prefix}link-hover-color-rgb: #{to-rgb($link-hover-color-dark)}; --#{$prefix}code-color: #{$code-color-dark}; + --#{$prefix}highlight-color: #{$mark-color-dark}; + --#{$prefix}highlight-bg: #{$mark-bg-dark}; --#{$prefix}border-color: #{$border-color-dark}; --#{$prefix}border-color-translucent: #{$border-color-translucent-dark}; diff --git a/vendor/twbs/bootstrap/scss/_utilities.scss b/vendor/twbs/bootstrap/scss/_utilities.scss index e6069c909..696f906ec 100644 --- a/vendor/twbs/bootstrap/scss/_utilities.scss +++ b/vendor/twbs/bootstrap/scss/_utilities.scss @@ -77,9 +77,9 @@ $utilities: map-merge( property: box-shadow, class: shadow, values: ( - null: $box-shadow, - sm: $box-shadow-sm, - lg: $box-shadow-lg, + null: var(--#{$prefix}box-shadow), + sm: var(--#{$prefix}box-shadow-sm), + lg: var(--#{$prefix}box-shadow-lg), none: none, ) ), diff --git a/vendor/twbs/bootstrap/scss/_variables-dark.scss b/vendor/twbs/bootstrap/scss/_variables-dark.scss index 494eefac2..6422b3874 100644 --- a/vendor/twbs/bootstrap/scss/_variables-dark.scss +++ b/vendor/twbs/bootstrap/scss/_variables-dark.scss @@ -40,7 +40,7 @@ $light-border-subtle-dark: $gray-700 !default; $dark-border-subtle-dark: $gray-800 !default; // scss-docs-end theme-border-subtle-dark-variables -$body-color-dark: $gray-500 !default; +$body-color-dark: $gray-300 !default; $body-bg-dark: $gray-900 !default; $body-secondary-color-dark: rgba($body-color-dark, .75) !default; $body-secondary-bg-dark: $gray-800 !default; @@ -53,6 +53,8 @@ $headings-color-dark: inherit !default; $link-color-dark: tint-color($primary, 40%) !default; $link-hover-color-dark: shift-color($link-color-dark, -$link-shade-percentage) !default; $code-color-dark: tint-color($code-color, 40%) !default; +$mark-color-dark: $body-color-dark !default; +$mark-bg-dark: $yellow-800 !default; // diff --git a/vendor/twbs/bootstrap/scss/_variables.scss b/vendor/twbs/bootstrap/scss/_variables.scss index 0288898d3..5429c017e 100644 --- a/vendor/twbs/bootstrap/scss/_variables.scss +++ b/vendor/twbs/bootstrap/scss/_variables.scss @@ -705,6 +705,10 @@ $hr-border-color: null !default; // Allows for inherited colors $hr-border-width: var(--#{$prefix}border-width) !default; $hr-opacity: .25 !default; +// scss-docs-start vr-variables +$vr-border-width: var(--#{$prefix}border-width) !default; +// scss-docs-end vr-variables + $legend-margin-bottom: .5rem !default; $legend-font-size: 1.5rem !default; $legend-font-weight: null !default; @@ -714,6 +718,7 @@ $dt-font-weight: $font-weight-bold !default; $list-inline-padding: .5rem !default; $mark-padding: .1875em !default; +$mark-color: $body-color !default; $mark-bg: $yellow-100 !default; // scss-docs-end type-variables @@ -730,7 +735,7 @@ $table-cell-padding-x-sm: .25rem !default; $table-cell-vertical-align: top !default; -$table-color: var(--#{$prefix}body-color) !default; +$table-color: var(--#{$prefix}emphasis-color) !default; $table-bg: var(--#{$prefix}body-bg) !default; $table-accent-bg: transparent !default; @@ -738,17 +743,17 @@ $table-th-font-weight: null !default; $table-striped-color: $table-color !default; $table-striped-bg-factor: .05 !default; -$table-striped-bg: rgba($black, $table-striped-bg-factor) !default; +$table-striped-bg: rgba(var(--#{$prefix}emphasis-color-rgb), $table-striped-bg-factor) !default; $table-active-color: $table-color !default; $table-active-bg-factor: .1 !default; -$table-active-bg: rgba($black, $table-active-bg-factor) !default; +$table-active-bg: rgba(var(--#{$prefix}emphasis-color-rgb), $table-active-bg-factor) !default; $table-hover-color: $table-color !default; $table-hover-bg-factor: .075 !default; -$table-hover-bg: rgba($black, $table-hover-bg-factor) !default; +$table-hover-bg: rgba(var(--#{$prefix}emphasis-color-rgb), $table-hover-bg-factor) !default; -$table-border-factor: .1 !default; +$table-border-factor: .2 !default; $table-border-width: var(--#{$prefix}border-width) !default; $table-border-color: var(--#{$prefix}border-color) !default; @@ -838,6 +843,7 @@ $btn-active-box-shadow: inset 0 3px 5px rgba($black, .125) !default; $btn-link-color: var(--#{$prefix}link-color) !default; $btn-link-hover-color: var(--#{$prefix}link-hover-color) !default; $btn-link-disabled-color: $gray-600 !default; +$btn-link-focus-shadow-rgb: to-rgb(mix(color-contrast($link-color), $link-color, 15%)) !default; // Allows for customizing button radius independently from global border radius $btn-border-radius: var(--#{$prefix}border-radius) !default; @@ -899,7 +905,7 @@ $input-disabled-border-color: null !default; $input-color: var(--#{$prefix}body-color) !default; $input-border-color: var(--#{$prefix}border-color) !default; $input-border-width: $input-btn-border-width !default; -$input-box-shadow: $box-shadow-inset !default; +$input-box-shadow: var(--#{$prefix}box-shadow-inset) !default; $input-border-radius: var(--#{$prefix}border-radius) !default; $input-border-radius-sm: var(--#{$prefix}border-radius-sm) !default; @@ -1015,7 +1021,7 @@ $form-select-feedback-icon-size: $input-height-inner-half $input-height-i $form-select-border-width: $input-border-width !default; $form-select-border-color: $input-border-color !default; $form-select-border-radius: $input-border-radius !default; -$form-select-box-shadow: $box-shadow-inset !default; +$form-select-box-shadow: var(--#{$prefix}box-shadow-inset) !default; $form-select-focus-border-color: $input-focus-border-color !default; $form-select-focus-width: $input-focus-width !default; @@ -1038,9 +1044,9 @@ $form-select-transition: $input-transition !default; $form-range-track-width: 100% !default; $form-range-track-height: .5rem !default; $form-range-track-cursor: pointer !default; -$form-range-track-bg: var(--#{$prefix}tertiary-bg) !default; +$form-range-track-bg: var(--#{$prefix}secondary-bg) !default; $form-range-track-border-radius: 1rem !default; -$form-range-track-box-shadow: $box-shadow-inset !default; +$form-range-track-box-shadow: var(--#{$prefix}box-shadow-inset) !default; $form-range-thumb-width: 1rem !default; $form-range-thumb-height: $form-range-thumb-width !default; @@ -1216,7 +1222,8 @@ $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-icon-color: $navbar-dark-color !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; @@ -1241,7 +1248,7 @@ $dropdown-border-width: var(--#{$prefix}border-width) !default; $dropdown-inner-border-radius: calc(#{$dropdown-border-radius} - #{$dropdown-border-width}) !default; // stylelint-disable-line function-disallowed-list $dropdown-divider-bg: $dropdown-border-color !default; $dropdown-divider-margin-y: $spacer * .5 !default; -$dropdown-box-shadow: $box-shadow !default; +$dropdown-box-shadow: var(--#{$prefix}box-shadow) !default; $dropdown-link-color: var(--#{$prefix}body-color) !default; $dropdown-link-hover-color: $dropdown-link-color !default; @@ -1430,7 +1437,7 @@ $popover-border-width: var(--#{$prefix}border-width) !default; $popover-border-color: var(--#{$prefix}border-color-translucent) !default; $popover-border-radius: var(--#{$prefix}border-radius-lg) !default; $popover-inner-border-radius: calc(#{$popover-border-radius} - #{$popover-border-width}) !default; // stylelint-disable-line function-disallowed-list -$popover-box-shadow: $box-shadow !default; +$popover-box-shadow: var(--#{$prefix}box-shadow) !default; $popover-header-font-size: $font-size-base !default; $popover-header-bg: var(--#{$prefix}secondary-bg) !default; @@ -1504,8 +1511,8 @@ $modal-content-border-color: var(--#{$prefix}border-color-translucent) !d $modal-content-border-width: var(--#{$prefix}border-width) !default; $modal-content-border-radius: var(--#{$prefix}border-radius-lg) !default; $modal-content-inner-border-radius: subtract($modal-content-border-radius, $modal-content-border-width) !default; -$modal-content-box-shadow-xs: $box-shadow-sm !default; -$modal-content-box-shadow-sm-up: $box-shadow !default; +$modal-content-box-shadow-xs: var(--#{$prefix}box-shadow-sm) !default; +$modal-content-box-shadow-sm-up: var(--#{$prefix}box-shadow) !default; $modal-backdrop-bg: $black !default; $modal-backdrop-opacity: .5 !default; @@ -1543,9 +1550,6 @@ $alert-margin-bottom: 1rem !default; $alert-border-radius: var(--#{$prefix}border-radius) !default; $alert-link-font-weight: $font-weight-bold !default; $alert-border-width: var(--#{$prefix}border-width) !default; -$alert-bg-scale: -80% !default; -$alert-border-scale: -70% !default; -$alert-color-scale: 40% !default; $alert-dismissible-padding-r: $alert-padding-x * 3 !default; // 3x covers width of x plus default padding on either side // scss-docs-end alert-variables diff --git a/vendor/twbs/bootstrap/scss/forms/_floating-labels.scss b/vendor/twbs/bootstrap/scss/forms/_floating-labels.scss index 3ca4264d7..2cf04704d 100644 --- a/vendor/twbs/bootstrap/scss/forms/_floating-labels.scss +++ b/vendor/twbs/bootstrap/scss/forms/_floating-labels.scss @@ -84,7 +84,8 @@ } } - > :disabled ~ label { + > :disabled ~ label, + > .form-control:disabled ~ label { // Required for `.form-control`s because of specificity color: $form-floating-label-disabled-color; &::after { diff --git a/vendor/twbs/bootstrap/scss/forms/_form-check.scss b/vendor/twbs/bootstrap/scss/forms/_form-check.scss index 83aacba2e..d3a8fe60d 100644 --- a/vendor/twbs/bootstrap/scss/forms/_form-check.scss +++ b/vendor/twbs/bootstrap/scss/forms/_form-check.scss @@ -29,17 +29,18 @@ .form-check-input { --#{$prefix}form-check-bg: #{$form-check-input-bg}; + flex-shrink: 0; width: $form-check-input-width; height: $form-check-input-width; margin-top: ($line-height-base - $form-check-input-width) * .5; // line-height minus check height vertical-align: top; + appearance: none; background-color: var(--#{$prefix}form-check-bg); background-image: var(--#{$prefix}form-check-bg-image); background-repeat: no-repeat; background-position: center; background-size: contain; border: $form-check-input-border; - appearance: none; print-color-adjust: exact; // Keep themed appearance for print @include transition($form-check-transition); diff --git a/vendor/twbs/bootstrap/scss/forms/_form-control.scss b/vendor/twbs/bootstrap/scss/forms/_form-control.scss index ca2a7df4c..67ae5f4f9 100644 --- a/vendor/twbs/bootstrap/scss/forms/_form-control.scss +++ b/vendor/twbs/bootstrap/scss/forms/_form-control.scss @@ -11,10 +11,10 @@ font-weight: $input-font-weight; line-height: $input-line-height; color: $input-color; + appearance: none; // Fix appearance for date inputs in Safari background-color: $input-bg; background-clip: padding-box; border: $input-border-width solid $input-border-color; - appearance: none; // Fix appearance for date inputs in Safari // Note: This has no effect on `s in CSS. @include border-radius($input-border-radius, 0); diff --git a/vendor/twbs/bootstrap/scss/forms/_form-range.scss b/vendor/twbs/bootstrap/scss/forms/_form-range.scss index 6de42132e..4732213e9 100644 --- a/vendor/twbs/bootstrap/scss/forms/_form-range.scss +++ b/vendor/twbs/bootstrap/scss/forms/_form-range.scss @@ -8,8 +8,8 @@ width: 100%; height: add($form-range-thumb-height, $form-range-thumb-focus-box-shadow-width * 2); padding: 0; // Need to reset padding - background-color: transparent; appearance: none; + background-color: transparent; &:focus { outline: 0; @@ -28,12 +28,12 @@ width: $form-range-thumb-width; height: $form-range-thumb-height; margin-top: ($form-range-track-height - $form-range-thumb-height) * .5; // Webkit specific + appearance: none; @include gradient-bg($form-range-thumb-bg); border: $form-range-thumb-border; @include border-radius($form-range-thumb-border-radius); @include box-shadow($form-range-thumb-box-shadow); @include transition($form-range-thumb-transition); - appearance: none; &:active { @include gradient-bg($form-range-thumb-active-bg); @@ -54,12 +54,12 @@ &::-moz-range-thumb { width: $form-range-thumb-width; height: $form-range-thumb-height; + appearance: none; @include gradient-bg($form-range-thumb-bg); border: $form-range-thumb-border; @include border-radius($form-range-thumb-border-radius); @include box-shadow($form-range-thumb-box-shadow); @include transition($form-range-thumb-transition); - appearance: none; &:active { @include gradient-bg($form-range-thumb-active-bg); diff --git a/vendor/twbs/bootstrap/scss/forms/_form-select.scss b/vendor/twbs/bootstrap/scss/forms/_form-select.scss index 0b26323ff..69ace529d 100644 --- a/vendor/twbs/bootstrap/scss/forms/_form-select.scss +++ b/vendor/twbs/bootstrap/scss/forms/_form-select.scss @@ -14,6 +14,7 @@ font-weight: $form-select-font-weight; line-height: $form-select-line-height; color: $form-select-color; + appearance: none; background-color: $form-select-bg; background-image: var(--#{$prefix}form-select-bg-img), var(--#{$prefix}form-select-bg-icon, none); background-repeat: no-repeat; @@ -23,7 +24,6 @@ @include border-radius($form-select-border-radius, 0); @include box-shadow($form-select-box-shadow); @include transition($form-select-transition); - appearance: none; &:focus { border-color: $form-select-focus-border-color; diff --git a/vendor/twbs/bootstrap/scss/helpers/_color-bg.scss b/vendor/twbs/bootstrap/scss/helpers/_color-bg.scss index c00acde5c..1a3a4cffd 100644 --- a/vendor/twbs/bootstrap/scss/helpers/_color-bg.scss +++ b/vendor/twbs/bootstrap/scss/helpers/_color-bg.scss @@ -1,8 +1,7 @@ // All-caps `RGBA()` function used because of this Sass bug: https://github.com/sass/node-sass/issues/2251 @each $color, $value in $theme-colors { - $color-rgb: to-rgb($value); .text-bg-#{$color} { color: color-contrast($value) if($enable-important-utilities, !important, null); - background-color: RGBA($color-rgb, var(--#{$prefix}bg-opacity, 1)) if($enable-important-utilities, !important, null); + background-color: RGBA(var(--#{$prefix}#{$color}-rgb), var(--#{$prefix}bg-opacity, 1)) if($enable-important-utilities, !important, null); } } diff --git a/vendor/twbs/bootstrap/scss/helpers/_vr.scss b/vendor/twbs/bootstrap/scss/helpers/_vr.scss index 9bca09953..b6f9d42cb 100644 --- a/vendor/twbs/bootstrap/scss/helpers/_vr.scss +++ b/vendor/twbs/bootstrap/scss/helpers/_vr.scss @@ -1,7 +1,7 @@ .vr { display: inline-block; align-self: stretch; - width: 1px; + width: $vr-border-width; min-height: 1em; background-color: currentcolor; opacity: $hr-opacity; diff --git a/vendor/twbs/bootstrap/scss/mixins/_banner.scss b/vendor/twbs/bootstrap/scss/mixins/_banner.scss index 4323989f3..ee2c58428 100644 --- a/vendor/twbs/bootstrap/scss/mixins/_banner.scss +++ b/vendor/twbs/bootstrap/scss/mixins/_banner.scss @@ -1,6 +1,6 @@ @mixin bsBanner($file) { /*! - * Bootstrap #{$file} v5.3.0 (https://getbootstrap.com/) + * Bootstrap #{$file} v5.3.2 (https://getbootstrap.com/) * Copyright 2011-2023 The Bootstrap Authors * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ diff --git a/vendor/twbs/bootstrap/scss/mixins/_grid.scss b/vendor/twbs/bootstrap/scss/mixins/_grid.scss index 38e2239fd..99b1e7dea 100644 --- a/vendor/twbs/bootstrap/scss/mixins/_grid.scss +++ b/vendor/twbs/bootstrap/scss/mixins/_grid.scss @@ -56,7 +56,7 @@ @mixin row-cols($count) { > * { flex: 0 0 auto; - width: divide(100%, $count); + width: percentage(divide(1, $count)); } } -- cgit v1.2.3