diff --git a/config.yaml b/config.yaml index 9c372027..58ef0757 100644 --- a/config.yaml +++ b/config.yaml @@ -19,8 +19,6 @@ module: - source: "static" target: "static" # Bootstrap - - source: "assets/_paige/bootstrap/scss/_vendor" - target: "assets/_paige/bootstrap/scss/vendor" - source: "paige/node_modules/bootstrap/dist/css" target: "assets/_paige/bootstrap" includeFiles: ["/bootstrap.css"] diff --git a/paige/README.md b/paige/README.md index 6324e10d..18f0d484 100644 --- a/paige/README.md +++ b/paige/README.md @@ -2,9 +2,9 @@ ## Update instructions -If you update Bootstrap, copy node_modules/bootstrap/scss/vendor/_rfs.scss to assets/paige/bootstrap/scss/_vendor/_rfs.scss. +If you update Bootstrap, rename `node_modules/bootstrap/scss/vendor` to `node_modules/bootstrap/scss/_vendor`. -`node_modules/bootstrap` was manually modified to apply a +`node_modules/bootstrap` is modified to apply a [critical fix](https://github.com/twbs/bootstrap/commit/f77117141dfe34d8fe984eabddf660e29cb96a57) that came after 5.3.0-alpha2. Once the fix is included in an NPM package, remove the modification. diff --git a/paige/node_modules/bootstrap/scss/_mixins.scss b/paige/node_modules/bootstrap/scss/_mixins.scss index e1e130b1..79ef20bd 100644 --- a/paige/node_modules/bootstrap/scss/_mixins.scss +++ b/paige/node_modules/bootstrap/scss/_mixins.scss @@ -3,7 +3,7 @@ // Used in conjunction with global variables to enable certain theme features. // Vendor -@import "vendor/rfs"; +@import "_vendor/rfs"; // Deprecate @import "mixins/deprecate"; diff --git a/paige/node_modules/bootstrap/scss/vendor/_rfs.scss b/paige/node_modules/bootstrap/scss/_vendor/_rfs.scss similarity index 100% rename from paige/node_modules/bootstrap/scss/vendor/_rfs.scss rename to paige/node_modules/bootstrap/scss/_vendor/_rfs.scss diff --git a/paige/node_modules/bootstrap/scss/bootstrap-grid.scss b/paige/node_modules/bootstrap/scss/bootstrap-grid.scss index 52bd577e..c82f6bcd 100644 --- a/paige/node_modules/bootstrap/scss/bootstrap-grid.scss +++ b/paige/node_modules/bootstrap/scss/bootstrap-grid.scss @@ -13,7 +13,7 @@ $include-column-box-sizing: true !default; @import "mixins/grid"; @import "mixins/utilities"; -@import "vendor/rfs"; +@import "_vendor/rfs"; @import "containers"; @import "grid";