From 412740e64430952110a0e3c4c7453cfb77d7fcd0 Mon Sep 17 00:00:00 2001
From: mwdelaney <michael.delaney@gmail.com>
Date: Mon, 13 Nov 2017 16:59:29 -0500
Subject: [PATCH] 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 7311f4f..19b0ca9 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 d49205d..9431140 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 dab6584..2a01fd7 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/**/*";