From 770b01504a5c03c95a25020883cb98dab28412d9 Mon Sep 17 00:00:00 2001 From: Draconizations Date: Fri, 3 Jun 2022 18:08:49 +0200 Subject: [PATCH] tweak(dashboard): remove unnecessary node_modules from import paths --- dashboard/styles/bootstrap-nightshade.scss | 146 ++++++++++----------- dashboard/styles/themes.scss | 2 +- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/dashboard/styles/bootstrap-nightshade.scss b/dashboard/styles/bootstrap-nightshade.scss index b9e42e27..a9f2c89a 100644 --- a/dashboard/styles/bootstrap-nightshade.scss +++ b/dashboard/styles/bootstrap-nightshade.scss @@ -15,57 +15,57 @@ $enable-colors-hack: true; // Configuration -@import "../node_modules/bootstrap/scss/functions"; -@import "../node_modules/bootstrap-dark-5/scss/dark/functions"; -@import "../node_modules/bootstrap/scss/variables"; -@import "../node_modules/bootstrap-dark-5/scss/variables-alt"; // dark color set is here -@import "../node_modules/bootstrap/scss/mixins"; -@import "../node_modules/bootstrap-dark-5/scss/dark/mixins-2"; // !!!! fix for issue #32 -@import "../node_modules/bootstrap/scss/utilities"; -@import "../node_modules/bootstrap-dark-5/scss/dark/utilities"; -@import "../node_modules/bootstrap-dark-5/scss/dark/patch"; // missing from BS, unsupported patch/hack +@import "bootstrap/scss/functions"; +@import "bootstrap-dark-5/scss/dark/functions"; +@import "bootstrap/scss/variables"; +@import "bootstrap-dark-5/scss/variables-alt"; // dark color set is here +@import "bootstrap/scss/mixins"; +@import "bootstrap-dark-5/scss/dark/mixins-2"; // !!!! fix for issue #32 +@import "bootstrap/scss/utilities"; +@import "bootstrap-dark-5/scss/dark/utilities"; +@import "bootstrap-dark-5/scss/dark/patch"; // missing from BS, unsupported patch/hack // :root { color-scheme: light; } // !!!! fix for issue #33, do not set // Layout & components -// @import "../node_modules/bootstrap-dark-5/scss/dark/root"; -@import "../node_modules/bootstrap/scss/reboot"; -@import "../node_modules/bootstrap-dark-5/scss/dark/root-alts"; // !!!! fix for issue #35 -@import "../node_modules/bootstrap/scss/type"; -@import "../node_modules/bootstrap/scss/images"; -@import "../node_modules/bootstrap/scss/containers"; -@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/nav"; -@import "../node_modules/bootstrap/scss/navbar"; -@import "../node_modules/bootstrap/scss/card"; -@import "../node_modules/bootstrap/scss/accordion"; -@import "../node_modules/bootstrap/scss/breadcrumb"; -@import "../node_modules/bootstrap/scss/pagination"; -@import "../node_modules/bootstrap/scss/badge"; -@import "../node_modules/bootstrap/scss/alert"; -@import "../node_modules/bootstrap/scss/progress"; -@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/offcanvas"; -@import "../node_modules/bootstrap/scss/placeholders"; +// @import "bootstrap-dark-5/scss/dark/root"; +@import "bootstrap/scss/reboot"; +@import "bootstrap-dark-5/scss/dark/root-alts"; // !!!! fix for issue #35 +@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/accordion"; +@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/offcanvas"; +@import "bootstrap/scss/placeholders"; // Helpers -@import "../node_modules/bootstrap/scss/helpers"; +@import "bootstrap/scss/helpers"; // Utilities -@import "../node_modules/bootstrap/scss/utilities/api"; +@import "bootstrap/scss/utilities/api"; /* * ---------- Dark Mode ------------------------------------------------------ @@ -76,40 +76,40 @@ $enable-colors-hack: true; // :root { color-scheme: dark; } // !!!! fix for issue #33, do not set // Layout & components - // @import "../node_modules/bootstrap-dark-5/scss/dark/root"; // !!!! fix for issue #33, do not use `dark/root` - @import "../node_modules/bootstrap-dark-5/scss/dark/reboot"; - @import "../node_modules/bootstrap-dark-5/scss/dark/type"; - @import "../node_modules/bootstrap-dark-5/scss/dark/images"; - @import "../node_modules/bootstrap-dark-5/scss/dark/tables"; - @import "../node_modules/bootstrap-dark-5/scss/dark/forms"; - @import "../node_modules/bootstrap-dark-5/scss/dark/buttons-2"; // !!!! fix for issue #32 - @import "../node_modules/bootstrap-dark-5/scss/dark/dropdown"; - @import "../node_modules/bootstrap-dark-5/scss/dark/button-group"; - @import "../node_modules/bootstrap-dark-5/scss/dark/nav"; - @import "../node_modules/bootstrap-dark-5/scss/dark/navbar"; - @import "../node_modules/bootstrap-dark-5/scss/dark/card"; - @import "../node_modules/bootstrap-dark-5/scss/dark/accordion"; - @import "../node_modules/bootstrap-dark-5/scss/dark/breadcrumb"; - @import "../node_modules/bootstrap-dark-5/scss/dark/pagination"; - @import "../node_modules/bootstrap-dark-5/scss/dark/badge"; - @import "../node_modules/bootstrap-dark-5/scss/dark/alert"; - @import "../node_modules/bootstrap-dark-5/scss/dark/progress"; - @import "../node_modules/bootstrap-dark-5/scss/dark/list-group"; - @import "../node_modules/bootstrap-dark-5/scss/dark/close"; - @import "../node_modules/bootstrap-dark-5/scss/dark/toasts"; - @import "../node_modules/bootstrap-dark-5/scss/dark/modal"; - @import "../node_modules/bootstrap-dark-5/scss/dark/tooltip"; - @import "../node_modules/bootstrap-dark-5/scss/dark/popover"; - @import "../node_modules/bootstrap-dark-5/scss/dark/carousel"; - @import "../node_modules/bootstrap-dark-5/scss/dark/offcanvas"; - @import "../node_modules/bootstrap-dark-5/scss/dark/placeholders"; + // @import "bootstrap-dark-5/scss/dark/root"; // !!!! fix for issue #33, do not use `dark/root` + @import "bootstrap-dark-5/scss/dark/reboot"; + @import "bootstrap-dark-5/scss/dark/type"; + @import "bootstrap-dark-5/scss/dark/images"; + @import "bootstrap-dark-5/scss/dark/tables"; + @import "bootstrap-dark-5/scss/dark/forms"; + @import "bootstrap-dark-5/scss/dark/buttons-2"; // !!!! fix for issue #32 + @import "bootstrap-dark-5/scss/dark/dropdown"; + @import "bootstrap-dark-5/scss/dark/button-group"; + @import "bootstrap-dark-5/scss/dark/nav"; + @import "bootstrap-dark-5/scss/dark/navbar"; + @import "bootstrap-dark-5/scss/dark/card"; + @import "bootstrap-dark-5/scss/dark/accordion"; + @import "bootstrap-dark-5/scss/dark/breadcrumb"; + @import "bootstrap-dark-5/scss/dark/pagination"; + @import "bootstrap-dark-5/scss/dark/badge"; + @import "bootstrap-dark-5/scss/dark/alert"; + @import "bootstrap-dark-5/scss/dark/progress"; + @import "bootstrap-dark-5/scss/dark/list-group"; + @import "bootstrap-dark-5/scss/dark/close"; + @import "bootstrap-dark-5/scss/dark/toasts"; + @import "bootstrap-dark-5/scss/dark/modal"; + @import "bootstrap-dark-5/scss/dark/tooltip"; + @import "bootstrap-dark-5/scss/dark/popover"; + @import "bootstrap-dark-5/scss/dark/carousel"; + @import "bootstrap-dark-5/scss/dark/offcanvas"; + @import "bootstrap-dark-5/scss/dark/placeholders"; // Helpers - @import "../node_modules/bootstrap-dark-5/scss/dark/helpers"; + @import "bootstrap-dark-5/scss/dark/helpers"; // Utilities - @import "../node_modules/bootstrap-dark-5/scss/dark/utilities/api"; + @import "bootstrap-dark-5/scss/dark/utilities/api"; // Unique to dark-mode - @import "../node_modules/bootstrap-dark-5/scss/dark/dark"; + @import "bootstrap-dark-5/scss/dark/dark"; } diff --git a/dashboard/styles/themes.scss b/dashboard/styles/themes.scss index 95864246..e0ddd06d 100644 --- a/dashboard/styles/themes.scss +++ b/dashboard/styles/themes.scss @@ -1,7 +1,7 @@ $primary: #da9317; $primary-alt: #da9317; -@import "../node_modules/bootstrap/scss/bootstrap.scss"; @import "generic.scss"; +@import "bootstrap/scss/bootstrap.scss"; // dark mode. dark.scss extends nightshade @import "bootstrap-nightshade.scss";