Merge branch 'dev'

Bug fixes: - Bower injecting 1 level too deep - PL Stylesheet not applying due to missing attribute
phase2 · May 5, 2015 · 15836df · 15836df
2 parents dd5d7af + 6f8d49f
commit 15836df
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git 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
@@ -123,7 +123,7 @@ module.exports = function (grunt, config) {
         options: {
           transform: function (filePath) {
             filePath = "../../../../" + filePath;
-            return '<link href="' + filePath + '" media="all" />';
+            return '<link rel="stylesheet" href="' + filePath + '" media="all" />';
           }
         },
         src: assets.css,
@@ -152,8 +152,15 @@ module.exports = function (grunt, config) {
               css: /<link.*href=['"]([^'"]+)/gi
             },
             replace: {
-              js: '<script src="{{filePath}}"></script>',
-              css: '<link rel="stylesheet" href="{{filePath}}" />'
+              // 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 '<script src="' + filePath + '"></script>';
+              },
+              css: function (filePath) {
+                filePath = filePath.replace('../', '');
+                return '<link rel="stylesheet" href="' + filePath + '" />';
+              } 
             }
           }
         }

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
@@ -13,15 +13,15 @@
     <!-- endbower -->
 
     <!-- injector:css -->
-    <link href="../../../../css/style.css" media="all" />
+    <link rel="stylesheet" href="../../../../css/style.css" media="all" />
     <!-- endinjector -->
 
     <!-- bower:js -->
-    <script src="../../../../../bower_components/modernizr/modernizr.js"></script>
-    <script src="../../../../../bower_components/jquery/jquery.js"></script>
-    <script src="../../../../../bower_components/jquery-migrate/jquery-migrate.js"></script>
-    <script src="../../../../../bower_components/drupal/index.js"></script>
-    <script src="../../../../../bower_components/lodash/lodash.js"></script>
+    <script src="../../../../bower_components/modernizr/modernizr.js"></script>
+    <script src="../../../../bower_components/jquery/jquery.js"></script>
+    <script src="../../../../bower_components/jquery-migrate/jquery-migrate.js"></script>
+    <script src="../../../../bower_components/drupal/index.js"></script>
+    <script src="../../../../bower_components/lodash/lodash.js"></script>
     <!-- endbower -->
 
     <!-- injector:js -->