diff --git a/grunt-tasks/compass/compass.js b/grunt-tasks/compass/compass.js
index 78a63c69ed..9fb8427860 100755
--- a/grunt-tasks/compass/compass.js
+++ b/grunt-tasks/compass/compass.js
@@ -5,13 +5,13 @@ module.exports = function (grunt, config) {
grunt.config.merge({
shell: {
stylesCompile: {
- command: "cd " + scssConfigRoot + " && bundle exec compass compile"
+ command: "cd " + config.scssConfigRoot + " && bundle exec compass compile"
}
},
scsslint: {
"options": {
- "bundleExec": scssConfigRoot,
- "config": scssConfigRoot + ".scss-lint.yml",
+ "bundleExec": config.scssConfigRoot,
+ "config": config.scssConfigRoot + ".scss-lint.yml",
"force": true,
"maxBuffer": 999999,
"colorizeOutput": true,
@@ -23,7 +23,7 @@ module.exports = function (grunt, config) {
},
watch: {
styles: {
- files: scssDir + "**/*.scss",
+ files: config.scssDir + "**/*.scss",
tasks: [
"shell:stylesCompile",
"shell:livereload",
diff --git a/grunt-tasks/pattern-lab/pattern-lab.js b/grunt-tasks/pattern-lab/pattern-lab.js
index bee42bae12..d157772852 100644
--- a/grunt-tasks/pattern-lab/pattern-lab.js
+++ b/grunt-tasks/pattern-lab/pattern-lab.js
@@ -123,7 +123,7 @@ module.exports = function (grunt, config) {
options: {
transform: function (filePath) {
filePath = "../../../../" + filePath;
- return '';
+ return '';
}
},
src: assets.css,
@@ -152,8 +152,15 @@ module.exports = function (grunt, config) {
css: /',
- css: ''
+ // since we inject 5 levels deep to a partial that compiles to a place that is 4 levels deep, we need to remove 1 `../`
+ js: function (filePath) {
+ filePath = filePath.replace('../', '');
+ return '';
+ },
+ css: function (filePath) {
+ filePath = filePath.replace('../', '');
+ return '';
+ }
}
}
}
diff --git a/pattern-lab/source/_patterns/00-atoms/00-meta/_00-head.mustache b/pattern-lab/source/_patterns/00-atoms/00-meta/_00-head.mustache
index 45f86863ff..27b02b6e08 100755
--- a/pattern-lab/source/_patterns/00-atoms/00-meta/_00-head.mustache
+++ b/pattern-lab/source/_patterns/00-atoms/00-meta/_00-head.mustache
@@ -13,15 +13,15 @@
-
+
-
-
-
-
-
+
+
+
+
+