fix: Call color-contrast only if type-of() == "color"

rstudio · Nov 19, 2024 · 514ad80 · 514ad80
1 parent 2355424
commit 514ad80
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/inst/builtin/bs5/shiny/_variables.scss b/inst/builtin/bs5/shiny/_variables.scss
@@ -143,7 +143,7 @@ $bslib-sidebar-fg: null !default;
 @if $bslib-sidebar-bg == null {
   // if sidebar-bg not set by user, default to body background
   $bslib-sidebar-bg: RGBA(var(--#{$prefix}body-bg-rgb), 0.05);
-} @else if $bslib-sidebar-fg == null {
+} @else if $bslib-sidebar-fg == null and type-of($bslib-sidebar-bg) == "color" {
   // if sidebar-bg but not -fg set by the user, find a contrasting color
   $bslib-sidebar-fg: color-contrast($bslib-sidebar-bg);
 }

diff --git a/inst/components/scss/sidebar.scss b/inst/components/scss/sidebar.scss
@@ -5,7 +5,7 @@ $bslib-sidebar-fg: null !default;
 @if $bslib-sidebar-bg == null {
   // sidebar bg not set by the user
   $bslib-sidebar-bg: rgba(var(--bs-emphasis-color-rgb, 0,0,0), 0.05);
-} @else if $bslib-sidebar-fg == null {
+} @else if $bslib-sidebar-fg == null and type-of($bslib-sidebar-bg) == "color" {
   // sidebar bg set, fg unset
   $bslib-sidebar-fg: color-contrast($bslib-sidebar-bg);
 }