Fix path to Glyphicons on build

Credits to @KevinLlopart for the idea.
yeoman · Jun 10, 2014 · 62355d5 · 62355d5
1 parent e961934
commit 62355d5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/app/templates/_package.json b/app/templates/_package.json
@@ -17,12 +17,14 @@
     "gulp-imagemin": "^0.6.0",
     "gulp-jshint": "^1.5.3",
     "gulp-livereload": "^2.0.0",
-    "gulp-load-plugins": "^0.5.0",<% if (includeSass) { %>
+    "gulp-load-plugins": "^0.5.0",<% if (includeSass) { if (includeBootstrap) { %>
+    "gulp-replace": "^0.3.0",<% } %>
     "gulp-ruby-sass": "^0.5.0",<% } %>
     "gulp-size": "^0.4.0",
     "gulp-uglify": "^0.3.0",
     "gulp-useref": "^0.4.2",
-    "jshint-stylish": "^0.2.0",
+    "jshint-stylish": "^0.2.0",<% if (includeBootstrap && includeSass) { %>
+    "lazypipe": "^0.2.1",<% } %>
     "opn": "^0.1.1",
     "rimraf": "^2.2.8",
     "streamqueue": "^0.1.1",

diff --git a/app/templates/gulpfile.js b/app/templates/gulpfile.js
@@ -22,11 +22,17 @@ gulp.task('jshint', function () {
         .pipe($.jshint.reporter('fail'));
 });
 
-gulp.task('html', ['styles'], function () {
+gulp.task('html', ['styles'], function () {<% if (includeBootstrap && includeSass) { %>
+    var lazypipe = require('lazypipe');
+    var cssChannel = lazypipe()
+      .pipe($.csso)
+      .pipe($.replace, 'bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap','fonts');<% } %>
+
     return gulp.src('app/*.html')
         .pipe($.useref.assets({searchPath: '{.tmp,app}'}))
-        .pipe($.if('*.js', $.uglify()))
-        .pipe($.if('*.css', $.csso()))
+        .pipe($.if('*.js', $.uglify()))<% if (includeBootstrap && includeSass) { %>
+        .pipe($.if('*.css', cssChannel()))<% } else { %>
+        .pipe($.if('*.css', $.csso()))<% } %>
         .pipe($.useref.restore())
         .pipe($.useref())
         .pipe(gulp.dest('dist'));