From 04d21a48190a118f5a9c8646bcd888dd88a3bf8c Mon Sep 17 00:00:00 2001 From: Dario Carbone Date: Thu, 1 Jun 2023 11:10:31 +0200 Subject: [PATCH 1/2] Update _variables.scss Quick fix for bootstrap 5.3.0 See: https://github.com/apalfrey/select2-bootstrap-5-theme/issues/75#issuecomment-1416307961 --- src/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_variables.scss b/src/_variables.scss index 6f70c81..d5bb8d7 100644 --- a/src/_variables.scss +++ b/src/_variables.scss @@ -75,7 +75,7 @@ $s2bs5-clear-width: .75rem !default; $s2bs5-clear-height: .75rem !default; $s2bs5-clear-padding-y: $btn-close-padding-y !default; $s2bs5-clear-padding-x: $btn-close-padding-x !default; -$s2bs5-clear-icon: str-replace($btn-close-bg, #{$btn-close-color}, #{shade-color($s2bs5-border-color, 50%)}) !default; +$s2bs5-clear-icon: str-replace($btn-close-bg, #{$btn-close-color}, #{shade-color(red, 50%)}) !default; $s2bs5-clear-bg: transparent escape-svg($s2bs5-clear-icon) center / $s2bs5-clear-height auto no-repeat !default; $s2bs5-clear-hover-bg: transparent escape-svg($btn-close-bg) center / $s2bs5-clear-height auto no-repeat !default; From 0e36595d4aed6da5793902e9c3a88a6315e97a7b Mon Sep 17 00:00:00 2001 From: Dario Carbone Date: Thu, 15 Jun 2023 08:58:51 +0200 Subject: [PATCH 2/2] Update _variables.scss Committed better solution seen here: https://github.com/apalfrey/select2-bootstrap-5-theme/pull/82#issuecomment-1573261275 --- src/_variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/_variables.scss b/src/_variables.scss index d5bb8d7..bfc546f 100644 --- a/src/_variables.scss +++ b/src/_variables.scss @@ -24,7 +24,7 @@ $s2bs5-bg-size: $form-select-bg-size !default; // Border & shadow $s2bs5-border-width: $form-select-border-width !default; -$s2bs5-border-color: $form-select-border-color !default; +$s2bs5-border-color: $border-color !default; $s2bs5-border-radius: $form-select-border-radius !default; $s2bs5-box-shadow: $form-select-box-shadow !default; $s2bs5-transition: $input-transition !default; @@ -75,7 +75,7 @@ $s2bs5-clear-width: .75rem !default; $s2bs5-clear-height: .75rem !default; $s2bs5-clear-padding-y: $btn-close-padding-y !default; $s2bs5-clear-padding-x: $btn-close-padding-x !default; -$s2bs5-clear-icon: str-replace($btn-close-bg, #{$btn-close-color}, #{shade-color(red, 50%)}) !default; +$s2bs5-clear-icon: str-replace($btn-close-bg, #{$btn-close-color}, #{shade-color($s2bs5-border-color, 50%)}) !default; $s2bs5-clear-bg: transparent escape-svg($s2bs5-clear-icon) center / $s2bs5-clear-height auto no-repeat !default; $s2bs5-clear-hover-bg: transparent escape-svg($btn-close-bg) center / $s2bs5-clear-height auto no-repeat !default;