fix scss import order

This commit is contained in:
axolotle
2021-05-22 12:47:12 +02:00
parent 10d2c1c385
commit ee9aeb13e5
6 changed files with 58 additions and 78 deletions
+12 -35
View File
@@ -1,41 +1,18 @@
/*
╭─────────────────────────────────────────────────────────────────╮
/!\ DO NOT IMPORT OR DEFINE ACTUAL RULES INTO THIS FILE /!\
Only things that disappear after scss compilation is allowed.
│ │
╰─────────────────────────────────────────────────────────────────╯
This file is magically imported into every components so that scss variables and
mixins can be accessed.
But if some rules are defined here, they will be copied into the final build as many
times as there are components…
*/
// ╭─────────────────────────────────────────────────────────────────╮
// │ │
///!\ DO NOT IMPORT OR DEFINE ACTUAL RULES INTO THIS FILE /!\
// │
//Only things that disappear after scss compilation is allowed.
// │
// ╰─────────────────────────────────────────────────────────────────╯
//
// This file is magically imported into every components so that scss variables and
// mixins can be accessed.
// But if some rules are defined here, they will be copied into the final build as many
// times as there are components…
// Custom variables must be imported first.
@import 'functions';
@import 'variables';
@import 'mixins';
// ┌─╮╭─╮╭─╮╶┬╴╭─╴╶┬╴┌─╮╭─┐┌─╮
// │╶┤│ ││ │ │ ╰─╮ │ ├┬╯├─┤├─╯
// └─╯╰─╯╰─╯ ╵ ╶─╯ ╵ ╵ ╰╵ ╵╵
@import '~bootstrap/scss/functions';
@import '~bootstrap/scss/variables';
@import '~bootstrap/scss/mixins';
// ┌─╮╭─╮╭─╮╶┬╴╭─╴╶┬╴┌─╮╭─┐┌─╮ ╷ ╷╷ ╷┌─╴
// │╶┤│ ││ │ │ ╰─╮ │ ├┬╯├─┤├─╯╶─╴│╭╯│ │├─╴
// └─╯╰─╯╰─╯ ╵ ╶─╯ ╵ ╵ ╰╵ ╵╵ ╰╯ ╰─╯╰─╴
@import '~bootstrap-vue/src/variables';
// mixins and functions overides must be imported after bootstrap's definitions.
// @import 'bootstrap-overrides/mixins';
@@ -0,0 +1 @@
@import '~bootstrap/scss/functions';
+1
View File
@@ -0,0 +1 @@
@import '~bootstrap/scss/mixins';
@@ -31,3 +31,7 @@ $text-card-header-height: 4rem;
$font-family-sans-serif: 'Noto Sans';
@import '~bootstrap/scss/variables';
@import '~bootstrap-vue/src/variables';
+1 -3
View File
@@ -1,6 +1,4 @@
@import 'abstracts/functions';
@import 'abstracts/variables';
@import 'abstracts/mixins';
@import 'abstracts/abstracts';
@import 'vendors/bootstrap';
+39 -40
View File
@@ -1,6 +1,4 @@
/*!
* Import of all needed bootstrap files except variables, functions and mixins
*/
// Import of all needed bootstrap files except variables, functions and mixins
// ┌─╮╭─╮╭─╮╶┬╴╭─╴╶┬╴┌─╮╭─┐┌─╮
@@ -9,40 +7,40 @@
// TODO OPTI: import only used
@import "~bootstrap/scss/root";
@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/transitions";
@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/badge";
@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/toasts";
@import "~bootstrap/scss/modal";
@import "~bootstrap/scss/tooltip";
@import "~bootstrap/scss/popover";
@import "~bootstrap/scss/carousel";
@import "~bootstrap/scss/spinners";
@import "~bootstrap/scss/utilities";
@import "~bootstrap/scss/print";
@import '~bootstrap/scss/root';
@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/transitions';
@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/badge';
@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/toasts';
@import '~bootstrap/scss/modal';
@import '~bootstrap/scss/tooltip';
@import '~bootstrap/scss/popover';
@import '~bootstrap/scss/carousel';
@import '~bootstrap/scss/spinners';
@import '~bootstrap/scss/utilities';
@import '~bootstrap/scss/print';
// ┌─╮╭─╮╭─╮╶┬╴╭─╴╶┬╴┌─╮╭─┐┌─╮ ╷ ╷╷ ╷┌─╴
@@ -51,10 +49,11 @@
// TODO OPTI: import only used
@import "~bootstrap-vue/src/utilities";
@import '~bootstrap-vue/src/utilities';
// General styling needed for special form controls
@import "~bootstrap-vue/src/custom-controls";
@import '~bootstrap-vue/src/custom-controls';
// Include custom SCSS for components
@import "~bootstrap-vue/src/components/index";
@import '~bootstrap-vue/src/components/index';
@import '~bootstrap-vue/src/icons/index';