Skip to content

Commit

Permalink
add tild to maintain compatibility with webpack
Browse files Browse the repository at this point in the history
  • Loading branch information
Robin committed Jun 18, 2020
1 parent 196cd25 commit a9bf519
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 37 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "npm run css && npm run js-compile",
"js-compile": "rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap",
"css-copy": "mkdir -p demo/assets && cp -r src/img demo/assets/img && cp -r node_modules/@fortawesome/fontawesome-free/webfonts demo/assets/fonts",
"css-compile": "npm run css-copy && node-sass --include-path node_modules --output-style compressed --source-map true --source-map-contents true --precision 6 src/scss -o demo/assets/css",
"css-compile": "npm run css-copy && node-sass --importer=node_modules/node-sass-tilde-importer --include-path node_modules --output-style compressed --source-map true --source-map-contents true --precision 6 src/scss -o demo/assets/css",
"css-prefix": "postcss --replace demo/assets/css/app.css --use autoprefixer --map",
"css-purge": "purgecss --css demo/assets/css/app.css --content demo/*.html --output demo/assets/css/",
"css": "npm run css-compile && npm run css-prefix",
Expand Down Expand Up @@ -43,6 +43,7 @@
"bootstrap": "github:twbs/bootstrap#main",
"bootstrap-cookie-consent": "^0.0.7",
"macy": "^2.5",
"node-sass-tilde-importer": "^1.0.2",
"piedweb-cms-js-helpers": "^0.0.21",
"tiny-slider": "^2.9.2"
},
Expand Down
68 changes: 34 additions & 34 deletions src/scss/_custom-bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
// scss-docs-start import-stack
// Configuration
@import 'bootstrap/scss/functions';
@import 'bootstrap/scss/variables';
@import 'bootstrap/scss/mixins';
@import 'bootstrap/scss/utilities';
@import '~bootstrap/scss/functions';
@import '~bootstrap/scss/variables';
@import '~bootstrap/scss/_mixins.scss';
@import '~bootstrap/scss/_utilities';

// Layout & components
@import 'bootstrap/scss/root';
@import 'bootstrap/scss/reboot';
@import 'bootstrap/scss/type';
@import 'bootstrap/scss/images';
@import 'bootstrap/scss/containers';
@import 'bootstrap/scss/grid';
//@import 'bootstrap/scss/tables';
@import 'bootstrap/scss/forms';
@import 'bootstrap/scss/buttons';
//@import 'bootstrap/scss/transitions';
//@import 'bootstrap/scss/dropdown';
//@import 'bootstrap/scss/button-group';
@import 'bootstrap/scss/nav';
@import 'bootstrap/scss/navbar';
@import 'bootstrap/scss/card';
@import 'bootstrap/scss/breadcrumb';
@import 'bootstrap/scss/pagination';
@import 'bootstrap/scss/badge';
@import 'bootstrap/scss/alert';
@import 'bootstrap/scss/progress';
//@import 'bootstrap/scss/list-group';
@import 'bootstrap/scss/close';
//@import 'bootstrap/scss/toasts';
//@import 'bootstrap/scss/modal';
//@import 'bootstrap/scss/tooltip';
//@import 'bootstrap/scss/popover';
//@import 'bootstrap/scss/carousel';
//@import 'bootstrap/scss/spinners';
@import '~bootstrap/scss/root';
@import '~bootstrap/scss/reboot';
@import '~bootstrap/scss/type';
@import '~bootstrap/scss/images';
@import '~bootstrap/scss/containers';
@import '~bootstrap/scss/grid';
//@import '~bootstrap/scss/tables';
@import '~bootstrap/scss/_forms';
@import '~bootstrap/scss/buttons';
//@import '~bootstrap/scss/transitions';
//@import '~bootstrap/scss/dropdown';
//@import '~bootstrap/scss/button-group';
@import '~bootstrap/scss/nav';
@import '~bootstrap/scss/navbar';
@import '~bootstrap/scss/card';
@import '~bootstrap/scss/breadcrumb';
@import '~bootstrap/scss/pagination';
@import '~bootstrap/scss/badge';
@import '~bootstrap/scss/alert';
@import '~bootstrap/scss/progress';
//@import '~bootstrap/scss/list-group';
@import '~bootstrap/scss/close';
//@import '~bootstrap/scss/toasts';
//@import '~bootstrap/scss/modal';
//@import '~bootstrap/scss/tooltip';
//@import '~bootstrap/scss/popover';
//@import '~bootstrap/scss/carousel';
//@import '~bootstrap/scss/spinners';

// Helpers
@import 'bootstrap/scss/helpers';
@import '~bootstrap/scss/_helpers';

// Utilities
@import 'bootstrap/scss/utilities/api';
@import '~bootstrap/scss/utilities/api';
4 changes: 2 additions & 2 deletions src/scss/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
//
// =Plugins
// --------------------------------------------------
@import 'baguettebox.js/src/baguetteBox';
@import '~baguettebox.js/src/baguetteBox';

/**/
$fa-font-path: '../fonts/webfonts';
@import '@fortawesome/fontawesome-free/scss/fontawesome.scss';
@import '~@fortawesome/fontawesome-free/scss/fontawesome.scss';
/**/
12 changes: 12 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1740,6 +1740,11 @@ fill-range@^7.0.1:
dependencies:
to-regex-range "^5.0.1"

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"
integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=

find-up@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
Expand Down Expand Up @@ -2587,6 +2592,13 @@ node-releases@^1.1.53:
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935"
integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==

node-sass-tilde-importer@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"
integrity sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==
dependencies:
find-parent-dir "^0.3.0"

node-sass@^4.14.1:
version "4.14.1"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"
Expand Down

0 comments on commit a9bf519

Please sign in to comment.