diff --git a/package.json b/package.json index 8043e921..5a684f10 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "build": "npm run build:js && npm run build:css", "build:js": "rollup js/index.js --output=dist/js/bootstrap-material-design.js -m --config=rollup.config.js && npm run build:js-min", "build:js-min": "minify dist/js/bootstrap-material-design.js --out-file dist/js/bootstrap-material-design.min.js", - "build:css": "mkdir -p dist/css && node-sass --include-path node_modules scss/bootstrap-material-design.scss > dist/css/bootstrap-material-design.css && npm run build:css-min", + "build:css": "mkdir -p dist/css && node-sass --include-path node_modules --importer=node_modules/node-sass-tilde-importer scss/bootstrap-material-design.scss > dist/css/bootstrap-material-design.css && npm run build:css-min", "build:css-min": "cssnano dist/css/bootstrap-material-design.css dist/css/bootstrap-material-design.min.css" }, "style": "dist/css/bootstrap-material-design.css", @@ -40,7 +40,9 @@ "url": "https://github.com/FezVrasta/bootstrap-material-design/issues" }, "license": "MIT", - "dependencies": {}, + "dependencies": { + "node-sass-tilde-importer": "^1.0.0" + }, "devDependencies": { "babel-core": "^6.25.0", "babel-minify": "^0.2.0", diff --git a/scss/_core-bootstrap.scss b/scss/_core-bootstrap.scss index 7ef77b8c..a5725966 100644 --- a/scss/_core-bootstrap.scss +++ b/scss/_core-bootstrap.scss @@ -3,9 +3,9 @@ //@import "../../bootstrap/scss/ // Core variables and mixins -@import "bootstrap/scss/functions"; -@import "bootstrap/scss/variables"; -@import "bootstrap/scss/mixins"; +@import "~bootstrap/scss/functions"; +@import "~bootstrap/scss/variables"; +@import "~bootstrap/scss/mixins"; // #853 start - https://github.com/twbs/bootstrap/pull/18976/files // hack @@ -24,42 +24,42 @@ // #853 end - https://github.com/twbs/bootstrap/pull/18976/files // Reset and dependencies -@import "bootstrap/scss/reboot"; -@import "bootstrap/scss/print"; +@import "~bootstrap/scss/reboot"; +@import "~bootstrap/scss/print"; // Core CSS -@import "bootstrap/scss/reboot"; -@import "bootstrap/scss/type"; -@import "bootstrap/scss/images"; -@import "bootstrap/scss/code"; -@import "bootstrap/scss/grid"; -@import "bootstrap/scss/tables"; -@import "bootstrap/scss/forms"; -@import "bootstrap/scss/buttons"; +@import "~bootstrap/scss/reboot"; +@import "~bootstrap/scss/type"; +@import "~bootstrap/scss/images"; +@import "~bootstrap/scss/code"; +@import "~bootstrap/scss/grid"; +@import "~bootstrap/scss/tables"; +@import "~bootstrap/scss/forms"; +@import "~bootstrap/scss/buttons"; // Components -@import "bootstrap/scss/dropdown"; -@import "bootstrap/scss/button-group"; -@import "bootstrap/scss/input-group"; -@import "bootstrap/scss/custom-forms"; -@import "bootstrap/scss/nav"; -@import "bootstrap/scss/navbar"; -@import "bootstrap/scss/card"; -@import "bootstrap/scss/breadcrumb"; -@import "bootstrap/scss/pagination"; -@import "bootstrap/scss/jumbotron"; -@import "bootstrap/scss/alert"; -@import "bootstrap/scss/progress"; -@import "bootstrap/scss/media"; -@import "bootstrap/scss/list-group"; -@import "bootstrap/scss/close"; -@import "bootstrap/scss/badge"; +@import "~bootstrap/scss/dropdown"; +@import "~bootstrap/scss/button-group"; +@import "~bootstrap/scss/input-group"; +@import "~bootstrap/scss/custom-forms"; +@import "~bootstrap/scss/nav"; +@import "~bootstrap/scss/navbar"; +@import "~bootstrap/scss/card"; +@import "~bootstrap/scss/breadcrumb"; +@import "~bootstrap/scss/pagination"; +@import "~bootstrap/scss/jumbotron"; +@import "~bootstrap/scss/alert"; +@import "~bootstrap/scss/progress"; +@import "~bootstrap/scss/media"; +@import "~bootstrap/scss/list-group"; +@import "~bootstrap/scss/close"; +@import "~bootstrap/scss/badge"; // Components w/ JavaScript -@import "bootstrap/scss/modal"; -@import "bootstrap/scss/tooltip"; -@import "bootstrap/scss/popover"; -@import "bootstrap/scss/carousel"; +@import "~bootstrap/scss/modal"; +@import "~bootstrap/scss/tooltip"; +@import "~bootstrap/scss/popover"; +@import "~bootstrap/scss/carousel"; // Utility classes -@import "bootstrap/scss/utilities"; +@import "~bootstrap/scss/utilities"; diff --git a/scss/_variables.scss b/scss/_variables.scss index 4e03a0f6..cb4b40a4 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -42,8 +42,8 @@ $bmd-label-color-inner-focus: $gray !default; // e.g. radio label or text-muted // import their vars after customization for use below $enable-flex: true; // fully adopt flexbox layouts $enable-shadows: true; // enable shadows, set to false to turn off shadows -@import "bootstrap/scss/functions"; // from bootstrap node_module -@import "bootstrap/scss/variables"; // from bootstrap node_module +@import "~bootstrap/scss/functions"; // from bootstrap node_module +@import "~bootstrap/scss/variables"; // from bootstrap node_module // @import "variables/layout"; diff --git a/yarn.lock b/yarn.lock index 61f969df..78d81c1b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1040,6 +1040,10 @@ extsprintf@1.3.0, extsprintf@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" +find-parent-dir@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54" + find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -1545,6 +1549,12 @@ node-gyp@^3.3.1: tar "^2.0.0" which "1" +node-sass-tilde-importer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.0.tgz#653d048a270464a1865ef9a99cc80ee2d80f9c97" + dependencies: + find-parent-dir "^0.3.0" + node-sass@^4.5.3: version "4.5.3" resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568"