Moved css files to css folder in styles (fixing styles task to trigge…

…rs twice when serving)
lightingbeetle · Feb 25, 2015 · 899c7e5 · 899c7e5
1 parent 2bc890e
commit 899c7e5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/index.js b/app/index.js
@@ -135,8 +135,8 @@ module.exports = yeoman.generators.Base.extend({
       if (this.sass) {
         this.directory('scss', 'app/styles/scss');
       } else {
-        this.copy('css/ink.css', 'app/styles/ink.css');
-        this.copy('css/main.css', 'app/styles/main.css');
+        this.copy('css/ink.css', 'app/styles/css/ink.css');
+        this.copy('css/main.css', 'app/styles/css/main.css');
       }
     },
 

diff --git a/app/templates/_gulpfile.js b/app/templates/_gulpfile.js
@@ -30,7 +30,7 @@ gulp.task('styles', function() {
 });
 <% } else { %>
 gulp.task('styles', function() {
-  return gulp.src(['app/styles/ink.css','app/styles/main.css'])
+  return gulp.src('app/styles/css/*.css')
     .pipe(concat('style.css'))
     .pipe(gulp.dest('app/styles'))
     .pipe(reload({stream: true}));
@@ -71,7 +71,7 @@ gulp.task('serve', ['styles'<% if (jade) { %>, 'jade'<% } %>], function() {
     host: 'localhost'
   });
 
-  gulp.watch('app/styles/<% if (sass) { %>**/*.scss<% } else { %>*.css<% } %>', ['styles']);
+  gulp.watch('app/styles/<% if (sass) { %>**/*.scss<% } else { %>css/*.css<% } %>', ['styles']);
   gulp.watch('app/*.html').on('change', reload);
   <% if (jade) { %>gulp.watch('app/template/**/*.jade', ['jade']);<% } %>
 });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-gulp-ink-email",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Yeoman generator for responsive html emails using Zurb Ink Framework",
   "keywords": [
     "yeoman-generator",