From b58ba798972661b7f3191cc818c3855aa53893ad Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 15 Sep 2023 13:37:25 +0200 Subject: Merging upstream version 5.3.2+dfsg. Signed-off-by: Daniel Baumann --- scss/_buttons.scss | 2 +- scss/_reboot.scss | 1 + scss/_root.scss | 3 +++ scss/_utilities.scss | 6 +++--- scss/_variables-dark.scss | 2 ++ scss/_variables.scss | 28 +++++++++++++++------------- scss/forms/_form-check.scss | 1 + scss/mixins/_banner.scss | 2 +- scss/mixins/_grid.scss | 2 +- 9 files changed, 28 insertions(+), 19 deletions(-) (limited to 'scss') diff --git a/scss/_buttons.scss b/scss/_buttons.scss index cbc0784..e14a184 100644 --- a/scss/_buttons.scss +++ b/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/scss/_reboot.scss b/scss/_reboot.scss index 81ea216..1879175 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -217,6 +217,7 @@ small { mark { padding: $mark-padding; + color: var(--#{$prefix}highlight-color); background-color: var(--#{$prefix}highlight-bg); } diff --git a/scss/_root.scss b/scss/_root.scss index ab720a3..becddf1 100644 --- a/scss/_root.scss +++ b/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/scss/_utilities.scss b/scss/_utilities.scss index e6069c9..696f906 100644 --- a/scss/_utilities.scss +++ b/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/scss/_variables-dark.scss b/scss/_variables-dark.scss index 79f29a3..6422b38 100644 --- a/scss/_variables-dark.scss +++ b/scss/_variables-dark.scss @@ -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/scss/_variables.scss b/scss/_variables.scss index eb066c6..5429c01 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -718,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 @@ -734,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; @@ -742,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; @@ -842,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; @@ -903,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; @@ -1019,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; @@ -1042,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; @@ -1246,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; @@ -1435,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; @@ -1509,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; diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss index f8d9b08..d3a8fe6 100644 --- a/scss/forms/_form-check.scss +++ b/scss/forms/_form-check.scss @@ -29,6 +29,7 @@ .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 diff --git a/scss/mixins/_banner.scss b/scss/mixins/_banner.scss index aa83dcc..ee2c584 100644 --- a/scss/mixins/_banner.scss +++ b/scss/mixins/_banner.scss @@ -1,6 +1,6 @@ @mixin bsBanner($file) { /*! - * Bootstrap #{$file} v5.3.1 (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/scss/mixins/_grid.scss b/scss/mixins/_grid.scss index 38e2239..99b1e7d 100644 --- a/scss/mixins/_grid.scss +++ b/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