From 1ee8036812e121bf1ffe4d33aea8073402db09e9 Mon Sep 17 00:00:00 2001 From: Paul Nevill Date: Wed, 30 Nov 2016 17:19:02 -0600 Subject: [PATCH] set bootstrap references to be non-relative --- scss/_core-bootstrap.scss | 72 +++++++++++++++++++-------------------- scss/_variables.scss | 2 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/scss/_core-bootstrap.scss b/scss/_core-bootstrap.scss index 95f6238f..762eafb4 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/custom"; -@import "bootstrap/scss/variables"; -@import "bootstrap/scss/mixins"; +@import "~bootstrap/scss/custom"; +@import "~bootstrap/scss/variables"; +@import "~bootstrap/scss/mixins"; // #853 start - https://github.com/twbs/bootstrap/pull/18976/files // hack @@ -25,44 +25,44 @@ // Reset and dependencies -@import "bootstrap/scss/normalize"; -@import "bootstrap/scss/print"; +@import "~bootstrap/scss/normalize"; +@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/animation"; -@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/tags"; -@import "bootstrap/scss/jumbotron"; -@import "bootstrap/scss/alert"; -@import "bootstrap/scss/progress"; -@import "bootstrap/scss/media"; -@import "bootstrap/scss/list-group"; -@import "bootstrap/scss/responsive-embed"; -@import "bootstrap/scss/close"; +@import "~bootstrap/scss/animation"; +@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/tags"; +@import "~bootstrap/scss/jumbotron"; +@import "~bootstrap/scss/alert"; +@import "~bootstrap/scss/progress"; +@import "~bootstrap/scss/media"; +@import "~bootstrap/scss/list-group"; +@import "~bootstrap/scss/responsive-embed"; +@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 f5372321..7200c936 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -42,7 +42,7 @@ $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/variables"; // from bootstrap node_module +@import "~bootstrap/scss/variables"; // from bootstrap node_module //