Further reduce chance of breaking changes; provide a singular entry p…

…oint for 'global' bslib rules
rstudio · Jul 10, 2023 · 9097581 · 9097581
1 parent 062c492
commit 9097581
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/R/bs-theme.R b/R/bs-theme.R
@@ -358,12 +358,8 @@ bootstrap_bundle <- function(version) {
     # 2. Allow Bootstrap 3 & 4 to use color-contrast() in variable definitions
     # 3. Allow Bootstrap 3 & 4 to use bs_get_contrast()
     sass_layer(
-      functions = sass_file(path_inst("bslib-scss", "color-contrast.scss")),
-      rules = list(
-        sass_file(path_inst("bslib-scss", "tab-fill.scss")),
-        # TODO: could component-ize this?
-        sass_file(path_inst("bslib-scss", "spacer.scss"))
-      )
+      functions = sass_file(path_inst("sass-utils/color-contrast.scss")),
+      rules = sass_file(path_inst("bslib-scss", "bslib.scss"))
     )
   )
 }

diff --git a/inst/bslib-scss/bslib.scss b/inst/bslib-scss/bslib.scss
@@ -0,0 +1,2 @@
+@import "spacer";
+@import "tab-fill";
diff --git a/inst/bslib-scss/color-contrast.scss → inst/sass-utils/color-contrast.scss b/inst/bslib-scss/color-contrast.scss → inst/sass-utils/color-contrast.scss