From 09e4829f290ad045f5865ac3e5a8793f28ddbd94 Mon Sep 17 00:00:00 2001 From: "Michael W. Delaney" Date: Mon, 13 Nov 2017 16:10:01 -0500 Subject: [PATCH 1/3] Remove explicit Bootstrap lines --- resources/assets/styles/main.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/resources/assets/styles/main.scss b/resources/assets/styles/main.scss index 89a97440..dab6584a 100644 --- a/resources/assets/styles/main.scss +++ b/resources/assets/styles/main.scss @@ -1,7 +1,3 @@ -@import "~bootstrap/scss/functions"; -@import "common/variables"; -@import "~bootstrap/scss/variables"; - /** Import everything from autoload */ @import "./autoload/**/*"; From 5346177700ea35a6348768e24489e86f701d73d7 Mon Sep 17 00:00:00 2001 From: "Michael W. Delaney" Date: Mon, 13 Nov 2017 16:10:39 -0500 Subject: [PATCH 2/3] Move variables and Bootstrap imports to autoload --- resources/assets/styles/autoload/_bootstrap.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/assets/styles/autoload/_bootstrap.scss b/resources/assets/styles/autoload/_bootstrap.scss index 19b0ca97..7311f4f3 100644 --- a/resources/assets/styles/autoload/_bootstrap.scss +++ b/resources/assets/styles/autoload/_bootstrap.scss @@ -1 +1,3 @@ +@import "~bootstrap/scss/functions"; +@import "../common/variables"; @import "~bootstrap/scss/bootstrap"; From cb3cc33128c1dd3ec806cd29f390f5f1b199bcee Mon Sep 17 00:00:00 2001 From: mwdelaney Date: Mon, 13 Nov 2017 16:59:29 -0500 Subject: [PATCH 3/3] Bootstrap function in _variables.scss to play nice with other frameworks --- resources/assets/styles/autoload/_bootstrap.scss | 2 -- resources/assets/styles/common/_variables.scss | 3 +++ resources/assets/styles/main.scss | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/assets/styles/autoload/_bootstrap.scss b/resources/assets/styles/autoload/_bootstrap.scss index 7311f4f3..19b0ca97 100644 --- a/resources/assets/styles/autoload/_bootstrap.scss +++ b/resources/assets/styles/autoload/_bootstrap.scss @@ -1,3 +1 @@ -@import "~bootstrap/scss/functions"; -@import "../common/variables"; @import "~bootstrap/scss/bootstrap"; diff --git a/resources/assets/styles/common/_variables.scss b/resources/assets/styles/common/_variables.scss index d49205db..94311401 100644 --- a/resources/assets/styles/common/_variables.scss +++ b/resources/assets/styles/common/_variables.scss @@ -1,3 +1,6 @@ +/** Import Bootstrap functions */ +@import "~bootstrap/scss/functions"; + $theme-colors: ( primary: #27ae60 ); diff --git a/resources/assets/styles/main.scss b/resources/assets/styles/main.scss index dab6584a..2a01fd79 100644 --- a/resources/assets/styles/main.scss +++ b/resources/assets/styles/main.scss @@ -1,3 +1,5 @@ +@import "common/variables"; + /** Import everything from autoload */ @import "./autoload/**/*";