Skip to content

feat: Use "cosmo" bootswatch only if neither preset nor bootswatch are set #444

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
gadenbuie merged 5 commits into from
Jan 27, 2026
Merged

feat: Use "cosmo" bootswatch only if neither preset nor bootswatch are set #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a480bfd
feat: Use "cosmo" bootswatch only if neither `preset` nor `bootswatch…
gadenbuie Oct 4, 2023
1ea2a7d
chore: update test snapshots
gadenbuie Jan 27, 2026
dd8c949
Merged origin/main into feat/bslib-preset
gadenbuie Jan 27, 2026
e071d19
`devtools::build_readme()` (GitHub Actions)
gadenbuie Jan 27, 2026
6ac59fa
chore: Add NEWS
gadenbuie Jan 27, 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
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

* flexdashboard now prevents top margin from being applied to boxes created with flexdashboard's markdown syntax when Bootstrap 5 is used. (#443)

* Allow using `theme.preset` without needing to set `theme.bootswatch` to `null`. (#444)

# flexdashboard 0.6.2

## New features
Expand Down
8 changes: 7 additions & 1 deletion R/bslib.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ resolve_theme <- function(theme) {
# Default to cosmo theme (just like the non-bslib usage does)
# (Users can explictly opt-out with bootswatch: default)
if (!is_bs_theme(theme)) {
theme <- utils::modifyList(list(bootswatch = "cosmo"), theme)
theme_default <- list()
# bslib 0.5.1 added the "preset" option, which flexdashboard users may provide
# However, `preset` should not be set with `bootswatch`
if (packageVersion("bslib") < "0.5.1" && !"preset" %in% names(theme)) {
theme_default$bootswatch <- "cosmo"
}
theme <- utils::modifyList(theme_default, theme)
theme <- do.call(bs_theme, theme)
}
# Also default to enable-rounded: true
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ rmarkdown::draft("dashboard.Rmd",

There are two main places to get help with flexdashboard:

- The [Posit
community](https://forum.posit.co/tag/flexdashboard)
- The [RStudio
community](https://community.rstudio.com/tags/c/R-Markdown/10/flexdashboard)
is a friendly place to ask any questions about flexdashboard. Be sure
to use the `flexdashboard` tag. Add also the `shiny` tag is you are
using a Shiny runtime.
Expand Down
4 changes: 2 additions & 2 deletions tests/testthat/_snaps/format.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<h3>A wide plot</h3>
<div class="knitr-options" data-fig-width="960" data-fig-height="480">
</div>
<p><img src="data:image/png;base64,..." width="960" data-figure-id="fig1" /></p>
<p><img role="img" aria-label src="data:image/png;base64,..." alt width="960" data-figure-id="fig1" /></p>
</div>
<div id="a-tall-plot" class="section level3">
<h3>A tall plot</h3>
<div class="knitr-options" data-fig-width="480" data-fig-height="960">
</div>
<p><img src="data:image/png;base64,..." width="480" data-figure-id="fig2" /></p>
<p><img role="img" aria-label src="data:image/png;base64,..." alt width="480" data-figure-id="fig2" /></p>

Loading