From 09f5265bac55942485b10d540e849a5468c6542f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?= Date: Fri, 6 Feb 2015 10:28:56 +0100 Subject: [PATCH 1/2] chore(Gruntfile): use yeoman.styles instead of "styles" in Gruntfile template --- templates/common/_Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/common/_Gruntfile.js b/templates/common/_Gruntfile.js index 3bf2012..b8a73a2 100644 --- a/templates/common/_Gruntfile.js +++ b/templates/common/_Gruntfile.js @@ -160,7 +160,7 @@ module.exports = function (grunt) { ignorePath: /\.\.\// }<% if (compass) { %>, sass: { - src: ['<%%= yeoman.app %>/styles/{,*/}*.{scss,sass}'], + src: ['<%%= yeoman.app %>/<%%= yeoman.styles %>/{,*/}*.{scss,sass}'], ignorePath: /(\.\.\/){1,2}bower_components\// }<% } %> }, From 67eef55daa8f61d7ddd72b6f43b782dc1cb5f528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?= Date: Fri, 6 Feb 2015 13:10:56 +0100 Subject: [PATCH 2/2] chore(Gruntfile): use yeoman.app for ionic font in Gruntfile template --- templates/common/_Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/common/_Gruntfile.js b/templates/common/_Gruntfile.js index b8a73a2..6bbd227 100644 --- a/templates/common/_Gruntfile.js +++ b/templates/common/_Gruntfile.js @@ -278,7 +278,7 @@ module.exports = function (grunt) { }, fonts: { expand: true, - cwd: 'app/bower_components/ionic/release/fonts/', + cwd: '<%%= yeoman.app %>/bower_components/ionic/release/fonts/', dest: '<%%= yeoman.app %>/fonts/', src: '*' },