chore: Update Sass from bslib (#1809)

scripts/_pkg-sources.R

@@ -1,6 +1,6 @@
 list(
-  bslib = "rstudio/bslib@main",
-  shiny = "rstudio/shiny@main",
+  bslib = "rstudio/bslib@b54bfb5de82f76bc044c4c661995af3a63e7ab29",
+  shiny = "rstudio/shiny@c489fef4ff46fc37eb2a7c447a7108afde7ad124",
   sass = "sass",
   htmltools = "rstudio/htmltools@main"
 )

shiny/www/shared/bootstrap/_version.json

@@ -1,7 +1,7 @@
 {
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
   "shiny_version": "1.9.1.9000 (rstudio/shiny@c489fef4ff46fc37eb2a7c447a7108afde7ad124)",
-  "bslib_version": "0.8.0.9000 (rstudio/bslib@7ff88a1e2a88fc7c6289059dd247ce88512f8231)",
+  "bslib_version": "0.8.0.9000 (rstudio/bslib@b54bfb5de82f76bc044c4c661995af3a63e7ab29)",
   "htmltools_version": "0.5.8.9000 (rstudio/htmltools@487aa0bed7313d7597b6edd5810e53cab0061198)",
   "bootstrap_version": "5.3.1"
 }

shiny/www/shared/bslib/_version.json

@@ -1,5 +1,5 @@
 {
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
   "package": "bslib",
-  "version": "0.8.0.9000 (rstudio/bslib@7ff88a1e2a88fc7c6289059dd247ce88512f8231)"
+  "version": "0.8.0.9000 (rstudio/bslib@b54bfb5de82f76bc044c4c661995af3a63e7ab29)"
 }

shiny/www/shared/sass/bslib/builtin/bs5/shiny/_rules.scss

@@ -130,12 +130,9 @@ $bslib-checkbox-radio-margin-right: 0.35em !default;
 @if $bslib-dashboard-design {
 
   :root {
-    --bslib-dashboard-sidebar-bg: var(--#{$prefix}body-bg);
-    --bslib-dashboard-sidebar-main-bg: var(--#{$prefix}body-bg);
     --bslib-dashboard-main-bg: rgb(247, 247, 247);
     --#{$prefix}card-border-color: var(--bslib-dashboard-border-color-translucent, var(--#{$prefix}border-color-translucent));
     --bslib-dashboard-card-header-font-weight: #{$font-weight-semibold};
-    --bslib-sidebar-bg: RGBA(var(--#{$prefix}body-bg-rgb), 0.05);
   }
 
   @include color-mode(dark) {
@@ -178,8 +175,12 @@ $bslib-checkbox-radio-margin-right: 0.35em !default;
 
   .bslib-page-navbar, .bslib-page-dashboard {
     > .navbar {
-      --bslib-navbar-default-bg: var(--#{$prefix}body-bg);
-      --bslib-navbar-inverse-bg: var(--#{$prefix}body-color);
+      @if not $navbar-light-bg and not $navbar-bg {
+        --bslib-navbar-default-bg: var(--#{$prefix}body-bg);
+      }
+      @if not $navbar-dark-bg and not $navbar-bg {
+        --bslib-navbar-inverse-bg: var(--#{$prefix}body-color);
+      }
     }
 
     > .navbar + div {
@@ -196,8 +197,10 @@ $bslib-checkbox-radio-margin-right: 0.35em !default;
   }
 
   .bslib-page-sidebar {
-    --bslib-page-sidebar-title-bg: var(--#{$prefix}body-bg);
-    --bslib-page-sidebar-title-color: var(--#{$prefix}body-color);
+    @if not $navbar-bg {
+      --bslib-page-sidebar-title-bg: var(--#{$prefix}body-bg);
+      --bslib-page-sidebar-title-color: var(--#{$prefix}body-color);
+    }
 
     .bslib-page-title {
       border-color: var(--#{$prefix}border-color-translucent);

shiny/www/shared/sass/bslib/builtin/bs5/shiny/_variables.scss

@@ -137,6 +137,17 @@ $card-border-radius: 8px !default;
 $bslib-dashboard-design: true !default;
 $bslib-enable-shadows: $bslib-dashboard-design !default;
 
+$bslib-sidebar-bg: null !default;
+$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 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);
+}
+
 $border-color-translucent: if($bslib-dashboard-design, rgba(40, 70, 94, 0.1), null) !default;
 $border-color-translucent-dark: if($bslib-dashboard-design, rgba(255, 255, 255, 0.1), null) !default;
 

shiny/www/shared/sass/bslib/components/scss/sidebar.scss

@@ -1,6 +1,19 @@
 // User-facing variables, use for theming
-$bslib-sidebar-bg: rgba(var(--bs-emphasis-color-rgb, 0,0,0), 0.05) !default;
-$bslib-sidebar-fg: var(--_main-fg) !default;
+$bslib-sidebar-bg: null !default;
+$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 and type-of($bslib-sidebar-bg) == "color" {
+  // sidebar bg set, fg unset
+  $bslib-sidebar-fg: color-contrast($bslib-sidebar-bg);
+}
+@if $bslib-sidebar-fg == null {
+  // sidebar bg and fg were unset
+  $bslib-sidebar-fg: var(--_main-fg);
+}
+
 $bslib-sidebar-toggle-bg: rgba(var(--bs-emphasis-color-rgb, 0,0,0), 0.1) !default;
 $bslib-sidebar-border: var(--bs-card-border-width, #{$card-border-width}) solid var(--bs-card-border-color, #{$card-border-color}) !default;