Merge pull request #1077 from DaftMonk/fix-sass-relative-paths

fix(gen:css): ensure scss/less/stylus files have proper relative paths

Author: Awk34

Diff for: app/templates/Gruntfile.js

@@ -609,11 +609,6 @@ module.exports = function (grunt) {
     stylus: {
       server: {
         options: {
-          paths: [
-            '<%%= yeoman.client %>/bower_components',
-            '<%%= yeoman.client %>/app',
-            '<%%= yeoman.client %>/components'
-          ],
           "include css": true
         },
         files: {
@@ -626,11 +621,6 @@ module.exports = function (grunt) {
     sass: {
       server: {
         options: {
-          loadPath: [
-            '<%%= yeoman.client %>/bower_components',
-            '<%%= yeoman.client %>/app',
-            '<%%= yeoman.client %>/components'
-          ],
           compass: false
         },
         files: {
@@ -641,18 +631,11 @@ module.exports = function (grunt) {
 
     // Compiles Less to CSS
     less: {
-      options: {
-        paths: [
-          '<%%= yeoman.client %>/bower_components',
-          '<%%= yeoman.client %>/app',
-          '<%%= yeoman.client %>/components'
-        ]
-      },
       server: {
         files: {
           '.tmp/app/app.css' : '<%%= yeoman.client %>/app/app.less'
         }
-      },
+      }
     },<% } %>
 
     injector: {
@@ -686,7 +669,7 @@ module.exports = function (grunt) {
         options: {
           transform: function(filePath) {
             filePath = filePath.replace('/client/app/', '');
-            filePath = filePath.replace('/client/components/', '');
+            filePath = filePath.replace('/client/components/', '../components/');
             return '@import \'' + filePath + '\';';
           },
           starttag: '// injector',
@@ -705,7 +688,7 @@ module.exports = function (grunt) {
         options: {
           transform: function(filePath) {
             filePath = filePath.replace('/client/app/', '');
-            filePath = filePath.replace('/client/components/', '');
+            filePath = filePath.replace('/client/components/', '../components/');
             return '@import \'' + filePath + '\';';
           },
           starttag: '// injector',
@@ -724,7 +707,7 @@ module.exports = function (grunt) {
         options: {
           transform: function(filePath) {
             filePath = filePath.replace('/client/app/', '');
-            filePath = filePath.replace('/client/components/', '');
+            filePath = filePath.replace('/client/components/', '../components/');
             return '@import \'' + filePath + '\';';
           },
           starttag: '// injector',

Diff for: app/templates/client/app/app(less).less

@@ -1,8 +1,8 @@
-<% if (filters.bootstrap) { %>@import 'bootstrap/less/bootstrap.less';<% } %>
-@import 'font-awesome/less/font-awesome.less';
+<% if (filters.bootstrap) { %>@import '../bower_components/bootstrap/less/bootstrap.less';<% } %>
+@import '../bower_components/font-awesome/less/font-awesome.less';
 
-<% if (filters.bootstrap) { %>@icon-font-path: '/bower_components/bootstrap/fonts/';<% } %>
-@fa-font-path: '/bower_components/font-awesome/fonts';
+<% if (filters.bootstrap) { %>@icon-font-path: '../bower_components/bootstrap/fonts/';<% } %>
+@fa-font-path: '../bower_components/font-awesome/fonts';
 
 /**
  * App-wide Styles

Diff for: app/templates/client/app/app(sass).scss

@@ -1,8 +1,8 @@
-<% if (filters.bootstrap) { %>$icon-font-path: "/bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";<% } %>
-$fa-font-path: "/bower_components/font-awesome/fonts";
+<% if (filters.bootstrap) { %>$icon-font-path: "../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";<% } %>
+$fa-font-path: "../bower_components/font-awesome/fonts";
 <% if (filters.bootstrap) { %>
-@import 'bootstrap-sass-official/vendor/assets/stylesheets/bootstrap';<% } %>
-@import 'font-awesome/scss/font-awesome';
+@import '../bower_components/bootstrap-sass-official/vendor/assets/stylesheets/bootstrap';<% } %>
+@import '../bower_components/font-awesome/scss/font-awesome';
 
 /**
  * App-wide Styles

Diff for: app/templates/client/app/app(stylus).styl

@@ -1,5 +1,5 @@
-@import "font-awesome/css/font-awesome.css"
-<% if (filters.bootstrap) { %>@import "bootstrap/dist/css/bootstrap.css"
+@import "../bower_components/font-awesome/css/font-awesome.css"
+<% if (filters.bootstrap) { %>@import "../bower_components/bootstrap/dist/css/bootstrap.css"
 
 //
 // Bootstrap Fonts