diff --git a/scss/_core-bootstrap.scss b/scss/_core-bootstrap.scss index 85d2905d..0b56fe98 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,41 +24,41 @@ // #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/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"; // 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";