fix(shiny-preset): Fix page dashboard class for page_sidebar/navbar (#…

…917) Co-authored-by: gadenbuie <[email protected]>
rstudio · Nov 22, 2023 · 6bfcef8 · 6bfcef8
1 parent 21821c1
commit 6bfcef8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # bslib (development version)
 
+* Fixed the CSS for the `bslib-page-dashboard` class in the Shiny preset to correctly support `page_sidebar(class = "bslib-page-dashboard")` and `page_navbar(nav_panel(class = "bslib-page-dashboard"))`. (#917)
+
 # bslib 0.6.0
 
 ## Breaking changes

diff --git a/inst/builtin/bs5/shiny/_rules.scss b/inst/builtin/bs5/shiny/_rules.scss
@@ -134,9 +134,13 @@ $bslib-checkbox-radio-margin-right: 0.35em !default;
     }
   }
 
-  // Set the background color of the page or main content area
-  .bslib-page-dashboard {
+  // Set the background color of page dashboard class...
+  .bslib-page-dashboard,
+  // or of global main content area in a page_navbar() with a global sidebar
+  .main:has(.tab-content > .bslib-page-dashboard.active) {
     background-color: var(--bslib-dashboard-main-bg);
+    // or of main area of a page_sidebar()
+    --_main-bg: var(--bslib-dashboard-main-bg);
   }
 
   .bslib-page-navbar, .bslib-page-dashboard {

diff --git a/inst/components/dist/components.js b/inst/components/dist/components.js
diff --git a/inst/components/dist/components.min.js b/inst/components/dist/components.min.js
diff --git a/inst/components/dist/web-components.js b/inst/components/dist/web-components.js