Merge pull request #46 in CONCORDIA/concorel-frontend from bugfix/SCS…

…S-dependecy-tree to develop * commit 'c3c7359f850491c0d95c4dd73f68b006025e3ac3': fix - SCSS dependency tree construction
unic · Feb 21, 2017 · 80b2056 · 80b2056
2 parents d049565 + c3c7359
commit 80b2056
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/gulp/css/default.js b/gulp/css/default.js
@@ -88,9 +88,9 @@ var taskName = 'css',
 
 				// Create dependency graph of currently piped file
 				var dependencyGraph = new helpers.dependencygraph(file.path, {
-						pattern: /@import "(.*?)"/g,
-						resolvePath: function(match) {
-							var resolvedPath = path.resolve('./source/assets/css', match + '.scss'),
+						pattern: /@import ["'](.*?)["']/g,
+						resolvePath: function(match, filePath) {
+							var resolvedPath = path.resolve(path.dirname(filePath), match + '.scss'),
 								prefixedResolvedPath;
 
 							// Retry with leading underscore if not found

diff --git a/source/modules/locationsearch/locationsearch.scss b/source/modules/locationsearch/locationsearch.scss
@@ -1,4 +1,4 @@
-@import "./../../node_modules/selectize/dist/css/selectize";
+@import "../../../node_modules/selectize/dist/css/selectize";
 
 .selectize-control.location-search {
 	$padding: 11px;

diff --git a/source/preview/assets/css/main.scss b/source/preview/assets/css/main.scss
@@ -1,10 +1,10 @@
-@import "../.tmp/colors";
-@import "globals/variables";
-@import "globals/functions";
-@import "globals/mixins";
-@import "globals/mediaqueries";
+@import "../../../assets/.tmp/colors";
+@import "../../../assets/css/globals/variables";
+@import "../../../assets/css/globals/functions";
+@import "../../../assets/css/globals/mixins";
+@import "../../../assets/css/globals/mediaqueries";
 
-@import "../../../node_modules/highlight.js/styles/github";
+@import "../../../../node_modules/highlight.js/styles/github";