diff --git a/scripts/htmlDependencies.R b/scripts/htmlDependencies.R index 2b3dba5dff..111d3bc605 100755 --- a/scripts/htmlDependencies.R +++ b/scripts/htmlDependencies.R @@ -243,7 +243,7 @@ fs::dir_copy(x_www_htmltools_fill, main_x_htmltools_fill) fs::file_delete( fs::dir_ls( fs::path(main_x_bslib_components, "components"), - regexp="(_version|sidebar)", + regexp="(_version|sidebar|nav_spacer)", invert = TRUE ) ) diff --git a/shiny/experimental/www/bslib/_version.json b/shiny/experimental/www/bslib/_version.json index c37722101a..4c9f03a9f0 100644 --- a/shiny/experimental/www/bslib/_version.json +++ b/shiny/experimental/www/bslib/_version.json @@ -1,5 +1,5 @@ { "note!": "This file is auto-generated by scripts/htmlDependencies.R", "package": "bslib", - "version": "Github (rstudio/bslib@867d0e1204acf567c05ff5859c7c59ba006f4782)" + "version": "Github (rstudio/bslib@625d6d374a11e9a545109cf7ad5f0e490865ecc9)" } diff --git a/shiny/ui/_x/_htmldeps.py b/shiny/ui/_x/_htmldeps.py index 85b56ed350..daa7efccb3 100644 --- a/shiny/ui/_x/_htmldeps.py +++ b/shiny/ui/_x/_htmldeps.py @@ -40,7 +40,7 @@ def sidebar_dependency() -> HTMLDependency: def nav_spacer_dependency() -> HTMLDependency: return HTMLDependency( - "bslib-nav-space", + "bslib-nav-spacer", bslib_version, source={ "package": "shiny", diff --git a/shiny/www/shared/_x/bslib/components/nav_spacer/nav_spacer.css b/shiny/www/shared/_x/bslib/components/nav_spacer/nav_spacer.css new file mode 100644 index 0000000000..be42a4f9eb --- /dev/null +++ b/shiny/www/shared/_x/bslib/components/nav_spacer/nav_spacer.css @@ -0,0 +1 @@ +@media (min-width: 576px){.nav:not(.nav-hidden){display:flex !important;display:-webkit-flex !important}.nav:not(.nav-hidden):not(.nav-stacked):not(.flex-column){float:none !important}.nav:not(.nav-hidden):not(.nav-stacked):not(.flex-column)>.bslib-nav-spacer{margin-left:auto !important}.nav:not(.nav-hidden):not(.nav-stacked):not(.flex-column)>.form-inline{margin-top:auto;margin-bottom:auto}.nav:not(.nav-hidden).nav-stacked{flex-direction:column;-webkit-flex-direction:column;height:100%}.nav:not(.nav-hidden).nav-stacked>.bslib-nav-spacer{margin-top:auto !important}} diff --git a/shiny/www/shared/bootstrap/_version.json b/shiny/www/shared/bootstrap/_version.json index 258b60f390..b3ea4cf467 100644 --- a/shiny/www/shared/bootstrap/_version.json +++ b/shiny/www/shared/bootstrap/_version.json @@ -1,7 +1,7 @@ { "note!": "This file is auto-generated by scripts/htmlDependencies.R", "shiny_version": "Github (rstudio/shiny@6fc06281bdfea3d2afa5582119469f15d2eed5fc)", - "bslib_version": "Github (rstudio/bslib@867d0e1204acf567c05ff5859c7c59ba006f4782)", + "bslib_version": "Github (rstudio/bslib@625d6d374a11e9a545109cf7ad5f0e490865ecc9)", "htmltools_version": "Github (rstudio/htmltools@6f082f843cd5d897ecae91f2154c5b9523637659)", "bootstrap_version": "5.2.2" }