Merge 'origin/main' into branch feat/navbar-options-bs5

.Rbuildignore

@@ -30,3 +30,5 @@ inst/lib/bsw3/.npmignore
 ^\.gitattributes$
 ^CODE_OF_CONDUCT\.md$
 ^cran-comments\.md$
+^inst/examples-shiny/brand.yml/Monda\.ttf$
+^inst/examples-shiny/brand.yml/Monda-OFL\.txt$

.gitignore

@@ -22,3 +22,5 @@ vignettes/*/index.html
 # rendered examples that appear in iframes
 vignettes/**/examples
 !vignettes/examples
+inst/examples-shiny/brand.yml/Monda-OFL.txt
+inst/examples-shiny/brand.yml/Monda.ttf

DESCRIPTION

@@ -54,7 +54,10 @@ Suggests:
     shiny (> 1.8.1),
     testthat,
     thematic,
-    withr
+    tools,
+    utils,
+    withr,
+    yaml
 Config/Needs/deploy:
     BH,
     chiflights22,
@@ -74,6 +77,7 @@ Config/Needs/deploy:
     lattice,
     leaflet,
     lubridate,
+    markdown,
     modelr,
     plotly,
     reactable,
@@ -119,6 +123,7 @@ Collate:
     'bs-remove.R'
     'bs-theme-layers.R'
     'bs-theme-preset-bootswatch.R'
+    'bs-theme-preset-brand.R'
     'bs-theme-preset-builtin.R'
     'bs-theme-preset.R'
     'utils.R'

NAMESPACE

@@ -3,6 +3,11 @@
 S3method(as.tags,bslib_sidebar)
 S3method(bind_task_button,ExtendedTask)
 S3method(bind_task_button,default)
+S3method(brand_resolve,"NULL")
+S3method(brand_resolve,brand_yml)
+S3method(brand_resolve,character)
+S3method(brand_resolve,list)
+S3method(brand_resolve,logical)
 S3method(is_fill_item,default)
 S3method(is_fill_item,htmlwidget)
 S3method(is_fillable_container,default)

NEWS.md

@@ -6,6 +6,10 @@
 
    Related to the above change, `navset_bar()` now defaults to using `underline = TRUE` so that both `page_navbar()` and `navset_bar()` use the same set of default `navbar_options()`.
 
+## New features
+
+* bslib now supports unified theming with [brand.yml](https://posit-dev.github.io/brand-yml). brand.yml lets you theme your Shiny apps, Quarto documents and more with a single, portable YAML file. Learn more in the new [Unified theming with brand.yml](https://rstudio.github.io/bslib/dev/articles/brand-yml/) article. (#1148)
+
 ## Improvements and bug fixes
 
 * `navset_card_pills()`, `navset_card_underline()`, `navset_card_tabs()` fixed to now respect header/footer arguments (@tanho63, #1024) 
@@ -14,6 +18,8 @@
 
 * Optimized for better performance the internal functions that compile Sass to call the `color-contrast()` algorithm. (#1140)
 
+* `input_switch()` and `input_dark_mode()` can be included in Shiny's [bookmarking feature](https://shiny.posit.co/r/articles/share/bookmarking-state/). (#1166)
+
 # bslib 0.8.0
 
 ## Breaking changes