From 76325bdc24b6c0a613981a4f95830341c09bf490 Mon Sep 17 00:00:00 2001
From: Andrew Koroluk <koroluka@gmail.com>
Date: Fri, 17 Jul 2015 18:51:33 -0400
Subject: [PATCH 1/2] fix(gen:css): ensure scss/less/stylus files have proper
 relative paths

---
 app/templates/Gruntfile.js                | 6 +++---
 app/templates/client/app/app(less).less   | 8 ++++----
 app/templates/client/app/app(sass).scss   | 8 ++++----
 app/templates/client/app/app(stylus).styl | 4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
index 361c49f1a..fde0acb0a 100644
--- a/app/templates/Gruntfile.js
+++ b/app/templates/Gruntfile.js
@@ -689,7 +689,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',
@@ -708,7 +708,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',
@@ -727,7 +727,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 --git a/app/templates/client/app/app(less).less b/app/templates/client/app/app(less).less
index 460b56bdb..cbfffbe88 100644
--- a/app/templates/client/app/app(less).less
+++ b/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 --git a/app/templates/client/app/app(sass).scss b/app/templates/client/app/app(sass).scss
index 30befa636..889878aee 100644
--- a/app/templates/client/app/app(sass).scss
+++ b/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 --git a/app/templates/client/app/app(stylus).styl b/app/templates/client/app/app(stylus).styl
index 9eab53889..d25cdfc59 100644
--- a/app/templates/client/app/app(stylus).styl
+++ b/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

From 799e94b9a12e119cc29bc68a864aab833f4e28ba Mon Sep 17 00:00:00 2001
From: Andrew Koroluk <koroluka@gmail.com>
Date: Wed, 5 Aug 2015 12:59:29 -0400
Subject: [PATCH 2/2] refactor(grunt): remove no longer needed paths

remove Sass/Stylus/Less include paths
---
 app/templates/Gruntfile.js | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
index fde0acb0a..d562f6b3b 100644
--- a/app/templates/Gruntfile.js
+++ b/app/templates/Gruntfile.js
@@ -612,11 +612,6 @@ module.exports = function (grunt) {
     stylus: {
       server: {
         options: {
-          paths: [
-            '<%%= yeoman.client %>/bower_components',
-            '<%%= yeoman.client %>/app',
-            '<%%= yeoman.client %>/components'
-          ],
           "include css": true
         },
         files: {
@@ -629,11 +624,6 @@ module.exports = function (grunt) {
     sass: {
       server: {
         options: {
-          loadPath: [
-            '<%%= yeoman.client %>/bower_components',
-            '<%%= yeoman.client %>/app',
-            '<%%= yeoman.client %>/components'
-          ],
           compass: false
         },
         files: {
@@ -644,18 +634,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: {