Merge branch 'release/0.4.1'

app/templates/tasks/icons.js

@@ -13,17 +13,19 @@ module.exports = function() {
   * Build icons font and stylesheets
   */
   gulp.task('icons', function(){
-    gulp.src(config.assets + 'icons/**/*')
+    gulp.src(config.assets + 'icons/**/*.svg')
       .pipe($.iconfont({
         fontName: name,
         appendCodepoints: true,
         normalize:true,
         fontHeight: 1001
       }))
-      .on('codepoints', function(codepoints, options) {
+      .on('glyphs', function(glyphs, options) {
         gulp.src('node_modules/toolbox-utils/templates/_icons.scss')
           .pipe($.consolidate('lodash', {
-            glyphs: codepoints,
+            glyphs: glyphs.map(function(glyph) {
+              return { name: glyph.name, codepoint: glyph.unicode[0].charCodeAt(0) }
+            }),
             fontName: name,
             fontPath: '../fonts/',
             className: name

app/templates/tasks/styles.js

@@ -14,11 +14,11 @@ module.exports = function() {
    * Build styles from SCSS files
    * With error reporting on compiling (so that there's no crash)
    */
-  return gulp.task('styles', function() {
+  gulp.task('styles', function() {
     if (argv.production) { console.log('[styles] Production mode' ); }
     else { console.log('[styles] Dev mode'); }
 
-    gulp.src([config.assets + 'sass/' + iconFontName + '.scss', config.assets + 'sass/main.scss'])
+    return gulp.src([config.assets + 'sass/' + iconFontName + '.scss', config.assets + 'sass/main.scss'])
       .pipe($.if(!argv.production, $.sourcemaps.init()))
       .pipe($.sass({
         outputStyle: 'nested', // libsass doesn't support expanded yet

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-toolbox",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Yeoman generator",
   "license": "MIT",
   "main": "app/index.js",

script/templates/jquery.js

@@ -1,5 +1,7 @@
 'use strict';
 
+/* global jQuery */
+
 (function($){
   $(document).ready(function(){
     // your code here