framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1993 from MWDelaney/master

Browse Source 
Move variables and Bootstrap lines to autoload
This commit is contained in:
Ben Word
2017-11-13 15:04:55 -07:00
committed by GitHub
parent db78e401e2 412740e644
commit 2b53c6997f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/assets/styles/common/_variables.scss
View File

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

2
resources/assets/styles/main.scss
View File

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