Merged origin/main into valuebox/scale-showcase-img

inst/css-precompiled/5/bootstrap.scss

@@ -0,0 +1,69 @@
+@import "inst/lib/bs5/scss/_functions.scss";
+@import "inst/sass-utils/color-contrast.scss";
+
+
+
+$enable-cssgrid: true !default;
+@import "inst/bs3compat/_defaults.scss";
+@import "inst/lib/bs5/scss/_variables.scss";
+$bootstrap-version: 5;
+$bslib-preset-name: null !default;
+$bslib-preset-type: null !default;
+@import "inst/lib/bs5/scss/_maps.scss";
+@import "inst/lib/bs5/scss/_mixins.scss";
+@import "inst/bs3compat/_declarations.scss";
+@import "inst/components/_variables.scss";
+@import "inst/components/_mixins.scss";
+:root {
+--bslib-bootstrap-version: #{$bootstrap-version};
+--bslib-preset-name: #{$bslib-preset-name};
+--bslib-preset-type: #{$bslib-preset-type};
+}
+@import "inst/lib/bs5/scss/mixins/_banner.scss";
+@include bsBanner('')
+@import "inst/lib/bs5/scss/_utilities.scss";
+@import "inst/lib/bs5/scss/_root.scss";
+@import "inst/lib/bs5/scss/_reboot.scss";
+@import "inst/lib/bs5/scss/_type.scss";
+@import "inst/lib/bs5/scss/_images.scss";
+@import "inst/lib/bs5/scss/_containers.scss";
+@import "inst/lib/bs5/scss/_grid.scss";
+@import "inst/lib/bs5/scss/_tables.scss";
+@import "inst/lib/bs5/scss/_forms.scss";
+@import "inst/lib/bs5/scss/_buttons.scss";
+@import "inst/lib/bs5/scss/_transitions.scss";
+@import "inst/lib/bs5/scss/_dropdown.scss";
+@import "inst/lib/bs5/scss/_button-group.scss";
+@import "inst/lib/bs5/scss/_nav.scss";
+@import "inst/lib/bs5/scss/_navbar.scss";
+@import "inst/lib/bs5/scss/_card.scss";
+@import "inst/lib/bs5/scss/_accordion.scss";
+@import "inst/lib/bs5/scss/_breadcrumb.scss";
+@import "inst/lib/bs5/scss/_pagination.scss";
+@import "inst/lib/bs5/scss/_badge.scss";
+@import "inst/lib/bs5/scss/_alert.scss";
+@import "inst/lib/bs5/scss/_progress.scss";
+@import "inst/lib/bs5/scss/_list-group.scss";
+@import "inst/lib/bs5/scss/_close.scss";
+@import "inst/lib/bs5/scss/_toasts.scss";
+@import "inst/lib/bs5/scss/_modal.scss";
+@import "inst/lib/bs5/scss/_tooltip.scss";
+@import "inst/lib/bs5/scss/_popover.scss";
+@import "inst/lib/bs5/scss/_carousel.scss";
+@import "inst/lib/bs5/scss/_spinners.scss";
+@import "inst/lib/bs5/scss/_offcanvas.scss";
+@import "inst/lib/bs5/scss/_placeholders.scss";
+@import "inst/lib/bs5/scss/_helpers.scss";
+@import "inst/lib/bs5/scss/utilities/_api.scss";
+.table th[align=left] { text-align: left; }
+.table th[align=right] { text-align: right; }
+.table th[align=center] { text-align: center; }
+@import "inst/bs3compat/_rules.scss";
+@import "inst/components/accordion.scss";
+@import "inst/components/card.scss";
+@import "inst/components/fill.scss";
+@import "inst/components/layout_column_wrap.scss";
+@import "inst/components/layout_columns.scss";
+@import "inst/components/sidebar.scss";
+@import "inst/components/value_box.scss";
+@import "inst/nav-spacer/nav-spacer.scss";

tools/yarn_install.R

@@ -431,4 +431,20 @@ lapply(versions(), function(version) {
     dir.create(dest_dir)
   }
   file.copy(tmp_css, dest_dir)
+
+  # Also save the BS5+ Sass code used to generate the pre-compiled CSS.
+  # This is primarily here to help Quarto more easily replicate bs_theme()'s Sass.
+  if (version >= 5) {
+    theme_sass <- gsub(
+      paste0("@import \"", getwd(), "/"),
+      "@import \"",
+      as_sass(bs_theme(version))
+    )
+    writeLines(theme_sass, file.path(dest_dir, "bootstrap.scss"))
+    # Sanity check that we we can compile by moving file to home dir
+    file.copy(file.path(dest_dir, "bootstrap.scss"), "bootstrap.scss")
+    on.exit(unlink("bootstrap.scss"), add = TRUE)
+    testthat::expect_error(sass(sass_file("bootstrap.scss")), NA)
+  }
 })
+

yarn.lock

@@ -302,7 +302,7 @@
 
 "@types/rstudio-shiny@https://github.com/rstudio/shiny#v1.7.4":
   version "1.7.4"
-  resolved "https://github.com/rstudio/shiny#4d276b307e73b1d312833f03a873e5c16a2dad48"
+  resolved "https://github.com/rstudio/shiny#6176f03ad0a706bfdf265ff23bd5ea7d90802a06"
   dependencies:
     "@types/bootstrap" "3.4.0"
     "@types/bootstrap-datepicker" "0.0.14"