Merge pull request #1993 from MWDelaney/master

Move variables and Bootstrap lines to autoload

resources/assets/styles/common/_variables.scss

@@ -1,3 +1,6 @@
+/** Import Bootstrap functions */
+@import "~bootstrap/scss/functions";
+
 $theme-colors: (
   primary: #27ae60
 );

resources/assets/styles/main.scss

@@ -1,6 +1,4 @@
-@import "~bootstrap/scss/functions";
 @import "common/variables";
-@import "~bootstrap/scss/variables";
 
 /** Import everything from autoload */
 @import "./autoload/**/*";