From 4408413e1a1a55472687962c91fb52f11292e22f Mon Sep 17 00:00:00 2001 From: Brian Ford Date: Wed, 26 Jun 2013 16:48:38 -0700 Subject: [PATCH] fix(build): add compass task only if compass-flavored bootstrap is selected --- templates/common/Gruntfile.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/common/Gruntfile.js b/templates/common/Gruntfile.js index 525b20279..b7227073f 100644 --- a/templates/common/Gruntfile.js +++ b/templates/common/Gruntfile.js @@ -36,11 +36,11 @@ module.exports = function (grunt) { coffeeTest: { files: ['test/spec/{,*/}*.coffee'], tasks: ['coffee:test'] - }, + },<% if (compassBootstrap) { %> compass: { files: ['<%%= yeoman.app %>/styles/{,*/}*.{scss,sass}'], tasks: ['compass:server'] - }, + },<% } %> livereload: { options: { livereload: LIVERELOAD_PORT @@ -136,7 +136,7 @@ module.exports = function (grunt) { ext: '.js' }] } - }, + },<% if (compassBootstrap) { %> compass: { options: { sassDir: '<%%= yeoman.app %>/styles', @@ -157,7 +157,7 @@ module.exports = function (grunt) { debugInfo: true } } - }, + },<% } %> // not used since Uglify task does concat, // but still available if needed /*concat: { @@ -259,16 +259,16 @@ module.exports = function (grunt) { }, concurrent: { server: [ - 'coffee:dist', - 'compass:server' + 'coffee:dist'<% if (compassBootstrap) { %>, + 'compass:server'<% } %> ], test: [ - 'coffee', - 'compass' + 'coffee'<% if (compassBootstrap) { %>, + 'compass'<% } %> ], dist: [ - 'coffee', - 'compass:dist', + 'coffee',<% if (compassBootstrap) { %> + 'compass:dist',<% } %> 'imagemin', 'htmlmin' ]