Skip to content

fix: Reorder bundle so bslib wins cascade ties against shiny.scss #2256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elnelson575 merged 2 commits into from
May 21, 2026
Merged

fix: Reorder bundle so bslib wins cascade ties against shiny.scss #2256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a69d06f
fix(scripts): Reorder bundle so bslib wins cascade ties against shiny…
elnelson575 May 21, 2026
c8533a3
chore(scripts): Restore bslib/shiny @main pins in `_pkg-sources.R`
elnelson575 May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions scripts/_functions_sass.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,21 @@ bslib_bs_theme <- function(version, preset = "shiny") {
bs_full_theme <- function(theme, path_sass_markers) {
bs_version <- bslib::theme_version(theme)

bs_bundle(
theme,
bslib = bslib_component_sass(),
shiny = shiny_sass(bs_version),
selectize = shiny_sass_selectize(bs_version),
ionrangeslider = shiny_sass_ionrangeslider(),
daterange = shiny_sass_daterange_picker(),
# The next layer must come last so that its text appears where a user layer would
marker = sass_layer_file(path_sass_markers),
# `shiny` before `theme` so bslib's bs3compat (baked into `theme`) wins cascade
# ties against R-shiny's shiny.scss. bs_bundle() requires theme-first, so call
# sass::sass_bundle() directly and reapply the bs_theme class.
structure(
sass::sass_bundle(
shiny = shiny_sass(bs_version),
theme,
bslib = bslib_component_sass(),
selectize = shiny_sass_selectize(bs_version),
ionrangeslider = shiny_sass_ionrangeslider(),
daterange = shiny_sass_daterange_picker(),
# The next layer must come last so that its text appears where a user layer would
marker = sass_layer_file(path_sass_markers),
),
class = class(theme)
)
}

Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/bootstrap/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/bootstrap/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -57,8 +59,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/bootstrap/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/cerulean/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/cosmo/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/cyborg/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/darkly/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/flatly/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/journal/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/litera/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/lumen/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/lux/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/materia/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/minty/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/morph/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/pulse/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/quartz/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/sandstone/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -61,8 +63,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
4 changes: 2 additions & 2 deletions shiny/www/shared/sass/preset/shiny/_04_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
:root {
--bslib-bootstrap-version: #{$bootstrap-version};
--bslib-preset-name: #{$bslib-preset-name};
Expand Down Expand Up @@ -58,8 +60,6 @@
@import "../../bslib/components/scss/toast.scss";
@import "../../bslib/components/scss/toolbar.scss";
@import "../../bslib/components/scss/value_box.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.bootstrap5.scss";
@import "../../shiny/www/shared/shiny_scss/shiny.scss";
@import "../../shiny/www/shared/selectize/scss/selectize.bootstrap5.scss";
$accent: $component-active-bg;
@import "../../shiny/www/shared/ionrangeslider/scss/shiny.scss";
Expand Down
Loading
Loading