Skip to content

Commit 7e58674

Browse files
committed
fix(app): only copy CSS if Compass is not installed
If Compass is installed, then CSS files should not be copied
1 parent a358c1a commit 7e58674

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

Diff for: templates/common/Gruntfile.js

+9-11
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ module.exports = function (grunt) {
4949
compass: {
5050
files: ['<%%= yeoman.app %>/styles/{,*/}*.{scss,sass}'],
5151
tasks: ['compass:server', 'autoprefixer']
52-
},<% } %>
52+
},<% } else { %>
5353
styles: {
5454
files: ['<%%= yeoman.app %>/styles/{,*/}*.css'],
5555
tasks: ['newer:copy:styles', 'autoprefixer']
56-
},
56+
},<% } %>
5757
gruntfile: {
5858
files: ['Gruntfile.js']
5959
},
@@ -322,9 +322,7 @@ module.exports = function (grunt) {
322322
expand: true,
323323
cwd: '.tmp/images',
324324
dest: '<%%= yeoman.dist %>/images',
325-
src: [
326-
'generated/*'
327-
]
325+
src: ['generated/*']
328326
}]
329327
},
330328
styles: {
@@ -339,18 +337,18 @@ module.exports = function (grunt) {
339337
concurrent: {
340338
server: [<% if (coffee) { %>
341339
'coffee:dist',<% } %><% if (compassBootstrap) { %>
342-
'compass:server',<% } %>
343-
'copy:styles'
340+
'compass:server'<% } else { %>
341+
'copy:styles'<% } %>
344342
],
345343
test: [<% if (coffee) { %>
346344
'coffee',<% } %><% if (compassBootstrap) { %>
347-
'compass',<% } %>
348-
'copy:styles'
345+
'compass'<% } else { %>
346+
'copy:styles'<% } %>
349347
],
350348
dist: [<% if (coffee) { %>
351349
'coffee',<% } %><% if (compassBootstrap) { %>
352-
'compass:dist',<% } %>
353-
'copy:styles',
350+
'compass:dist',<% } else { %>
351+
'copy:styles',<% } %>
354352
'imagemin',
355353
'svgmin',
356354
'htmlmin'

0 commit comments

Comments
 (0)