From 39a9a8fd2aaabdb96c810f12a80efdd8f267c9c5 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Mon, 30 Nov 2020 12:41:23 +0200 Subject: [PATCH] Adjust source/scss for dart sass Imports are relative to the current file it seems. --- source/scss/bootstrap.scss | 74 +++++++++++++++++++------------------- source/scss/style.scss | 4 +-- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/source/scss/bootstrap.scss b/source/scss/bootstrap.scss index ada7357..29cbc28 100644 --- a/source/scss/bootstrap.scss +++ b/source/scss/bootstrap.scss @@ -5,40 +5,40 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -@import "node_modules/bootstrap/scss/functions"; -@import "node_modules/bootstrap/scss/variables"; -@import "node_modules/bootstrap/scss/mixins"; -//@import "node_modules/bootstrap/scss/root"; -@import "node_modules/bootstrap/scss/reboot"; -@import "node_modules/bootstrap/scss/type"; -@import "node_modules/bootstrap/scss/images"; -@import "node_modules/bootstrap/scss/code"; -@import "node_modules/bootstrap/scss/grid"; -//@import "node_modules/bootstrap/scss/tables"; -@import "node_modules/bootstrap/scss/forms"; -@import "node_modules/bootstrap/scss/buttons"; -//@import "node_modules/bootstrap/scss/transitions"; -//@import "node_modules/bootstrap/scss/dropdown"; -//@import "node_modules/bootstrap/scss/button-group"; -//@import "node_modules/bootstrap/scss/input-group"; -//@import "node_modules/bootstrap/scss/custom-forms"; -@import "node_modules/bootstrap/scss/nav"; -@import "node_modules/bootstrap/scss/navbar"; -//@import "node_modules/bootstrap/scss/card"; -//@import "node_modules/bootstrap/scss/breadcrumb"; -@import "node_modules/bootstrap/scss/pagination"; -//@import "node_modules/bootstrap/scss/badge"; -//@import "node_modules/bootstrap/scss/jumbotron"; -//@import "node_modules/bootstrap/scss/alert"; -//@import "node_modules/bootstrap/scss/progress"; -//@import "node_modules/bootstrap/scss/media"; -//@import "node_modules/bootstrap/scss/list-group"; -//@import "node_modules/bootstrap/scss/close"; -//@import "node_modules/bootstrap/scss/toasts"; -//@import "node_modules/bootstrap/scss/modal"; -//@import "node_modules/bootstrap/scss/tooltip"; -//@import "node_modules/bootstrap/scss/popover"; -//@import "node_modules/bootstrap/scss/carousel"; -//@import "node_modules/bootstrap/scss/spinners"; -@import "node_modules/bootstrap/scss/utilities"; -@import "node_modules/bootstrap/scss/print"; +@import "../../node_modules/bootstrap/scss/functions"; +@import "../../node_modules/bootstrap/scss/variables"; +@import "../../node_modules/bootstrap/scss/mixins"; +//@import "../../node_modules/bootstrap/scss/root"; +@import "../../node_modules/bootstrap/scss/reboot"; +@import "../../node_modules/bootstrap/scss/type"; +@import "../../node_modules/bootstrap/scss/images"; +@import "../../node_modules/bootstrap/scss/code"; +@import "../../node_modules/bootstrap/scss/grid"; +//@import "../../node_modules/bootstrap/scss/tables"; +@import "../../node_modules/bootstrap/scss/forms"; +@import "../../node_modules/bootstrap/scss/buttons"; +//@import "../../node_modules/bootstrap/scss/transitions"; +//@import "../../node_modules/bootstrap/scss/dropdown"; +//@import "../../node_modules/bootstrap/scss/button-group"; +//@import "../../node_modules/bootstrap/scss/input-group"; +//@import "../../node_modules/bootstrap/scss/custom-forms"; +@import "../../node_modules/bootstrap/scss/nav"; +@import "../../node_modules/bootstrap/scss/navbar"; +//@import "../../node_modules/bootstrap/scss/card"; +//@import "../../node_modules/bootstrap/scss/breadcrumb"; +@import "../../node_modules/bootstrap/scss/pagination"; +//@import "../../node_modules/bootstrap/scss/badge"; +//@import "../../node_modules/bootstrap/scss/jumbotron"; +//@import "../../node_modules/bootstrap/scss/alert"; +//@import "../../node_modules/bootstrap/scss/progress"; +//@import "../../node_modules/bootstrap/scss/media"; +//@import "../../node_modules/bootstrap/scss/list-group"; +//@import "../../node_modules/bootstrap/scss/close"; +//@import "../../node_modules/bootstrap/scss/toasts"; +//@import "../../node_modules/bootstrap/scss/modal"; +//@import "../../node_modules/bootstrap/scss/tooltip"; +//@import "../../node_modules/bootstrap/scss/popover"; +//@import "../../node_modules/bootstrap/scss/carousel"; +//@import "../../node_modules/bootstrap/scss/spinners"; +@import "../../node_modules/bootstrap/scss/utilities"; +@import "../../node_modules/bootstrap/scss/print"; diff --git a/source/scss/style.scss b/source/scss/style.scss index 64f3f81..9c57d6b 100644 --- a/source/scss/style.scss +++ b/source/scss/style.scss @@ -1,6 +1,6 @@ // selectively import components we need from bootstrap // see: node_modules/bootstrap/scss/bootstrap.scss -@import 'source/scss/bootstrap'; +@import 'bootstrap'; // local style overrides -@import 'source/scss/main'; +@import 'main';