fix(app): only copy CSS if Compass is not installed

If Compass is installed, then CSS files should not be copied
angular-fullstack · Dec 6, 2013 · 7e58674 · 7e58674
1 parent a358c1a
commit 7e58674
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/templates/common/Gruntfile.js b/templates/common/Gruntfile.js
@@ -49,11 +49,11 @@ module.exports = function (grunt) {
       compass: {
         files: ['<%%= yeoman.app %>/styles/{,*/}*.{scss,sass}'],
         tasks: ['compass:server', 'autoprefixer']
-      },<% } %>
+      },<% } else { %>
       styles: {
         files: ['<%%= yeoman.app %>/styles/{,*/}*.css'],
         tasks: ['newer:copy:styles', 'autoprefixer']
-      },
+      },<% } %>
       gruntfile: {
         files: ['Gruntfile.js']
       },
@@ -322,9 +322,7 @@ module.exports = function (grunt) {
           expand: true,
           cwd: '.tmp/images',
           dest: '<%%= yeoman.dist %>/images',
-          src: [
-            'generated/*'
-          ]
+          src: ['generated/*']
         }]
       },
       styles: {
@@ -339,18 +337,18 @@ module.exports = function (grunt) {
     concurrent: {
       server: [<% if (coffee) { %>
         'coffee:dist',<% } %><% if (compassBootstrap) { %>
-        'compass:server',<% } %>
-        'copy:styles'
+        'compass:server'<% } else { %>
+        'copy:styles'<% } %>
       ],
       test: [<% if (coffee) { %>
         'coffee',<% } %><% if (compassBootstrap) { %>
-        'compass',<% } %>
-        'copy:styles'
+        'compass'<% } else { %>
+        'copy:styles'<% } %>
       ],
       dist: [<% if (coffee) { %>
         'coffee',<% } %><% if (compassBootstrap) { %>
-        'compass:dist',<% } %>
-        'copy:styles',
+        'compass:dist',<% } else { %>
+        'copy:styles',<% } %>
         'imagemin',
         'svgmin',
         'htmlmin'