Skip to content
This repository has been archived by the owner on Mar 26, 2018. It is now read-only.

Commit

Permalink
fix(build): add compass task only if compass-flavored bootstrap is se…
Browse files Browse the repository at this point in the history 
…lected
  • Loading branch information
@btford
btford committed Jun 26, 2013
1 parent 6cbb80f commit 4408413
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions templates/common/Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -136,7 +136,7 @@ module.exports = function (grunt) {
ext: '.js'
}]
}
},
},<% if (compassBootstrap) { %>
compass: {
options: {
sassDir: '<%%= yeoman.app %>/styles',
Expand All @@ -157,7 +157,7 @@ module.exports = function (grunt) {
debugInfo: true
}
}
},
},<% } %>
// not used since Uglify task does concat,
// but still available if needed
/*concat: {
Expand Down Expand Up @@ -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'
]
Expand Down

3 comments on commit 4408413

@tedkornish
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of interest, why not just include a separate question in the yo angular initialization process for asking whether or not the user wants to include sass? It's entirely possible that people will want to use sass/scss, but not Bootstrap.

@FWeinb
Copy link

@FWeinb FWeinb commented on 4408413 Aug 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 for Sass without Bootstrap or at least note it in the option for Bootstrap.

@samaxes
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created the issue #330 asking for the same thing.

Please sign in to comment.