From 609fa138032e1bb794edb849cd463cfe594f0e2d Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Tue, 5 May 2015 09:56:09 -1000 Subject: [PATCH 1/3] fixing lint errors --- grunt-tasks/compass/compass.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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", From 2472e795ef513cfc009b7262970a0ab791ab1195 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Tue, 5 May 2015 10:00:16 -1000 Subject: [PATCH 2/3] fixing bower's wiredep going 1 level too deep on paths --- grunt-tasks/pattern-lab/pattern-lab.js | 11 +++++++++-- .../_patterns/00-atoms/00-meta/_00-head.mustache | 10 +++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/grunt-tasks/pattern-lab/pattern-lab.js b/grunt-tasks/pattern-lab/pattern-lab.js index bee42bae12..8adfd80228 100644 --- a/grunt-tasks/pattern-lab/pattern-lab.js +++ b/grunt-tasks/pattern-lab/pattern-lab.js @@ -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..7239edc1b0 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 @@ -17,11 +17,11 @@ - - - - - + + + + + From 6f8d49fb1d02e4e5048ac0644b05fa82249b1583 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Tue, 5 May 2015 10:02:36 -1000 Subject: [PATCH 3/3] adding misssing attribute for stylesheets --- grunt-tasks/pattern-lab/pattern-lab.js | 2 +- pattern-lab/source/_patterns/00-atoms/00-meta/_00-head.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grunt-tasks/pattern-lab/pattern-lab.js b/grunt-tasks/pattern-lab/pattern-lab.js index 8adfd80228..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, 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 7239edc1b0..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,7 +13,7 @@ - +