diff options
author | Mark Otto <markd.otto@gmail.com> | 2021-09-02 08:41:58 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-02 08:41:58 +0300 |
commit | d91480e3c769e3cce5aca4ab83604e6cfaeb1b06 (patch) | |
tree | 525ab8ef41df90074455ebcf2c2c90399ba63ce6 /scss | |
parent | 283cbd902669732943885e94115a0e29a952baf6 (diff) |
Include root.scss in all dist builds (#34773)
* Remove the font-family-* override vars from Reboot build
* Update Reboot docs to mention CSS variables
Diffstat (limited to 'scss')
-rw-r--r-- | scss/bootstrap-grid.scss | 2 | ||||
-rw-r--r-- | scss/bootstrap-reboot.scss | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss index 2c68fbbf7c..72796d165e 100644 --- a/scss/bootstrap-grid.scss +++ b/scss/bootstrap-grid.scss @@ -18,6 +18,8 @@ $include-column-box-sizing: true !default; @import "vendor/rfs"; +@import "root"; + @import "containers"; @import "grid"; diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss index 0c4bbe589b..0b83043a42 100644 --- a/scss/bootstrap-reboot.scss +++ b/scss/bootstrap-reboot.scss @@ -8,8 +8,6 @@ @import "functions"; @import "variables"; -// Prevent the usage of custom properties since we don't add them to `:root` in reboot -$font-family-base: $font-family-sans-serif; // stylelint-disable-line scss/dollar-variable-default -$font-family-code: $font-family-monospace; // stylelint-disable-line scss/dollar-variable-default @import "mixins"; +@import "root"; @import "reboot"; |