Commit 5da123e0d03b8b2fac7148a33f7e32bffac5d427
1 parent
b1473f35
Exists in
master
and in
1 other branch
Fix inclusion of font awesome
Showing
2 changed files
with
7 additions
and
0 deletions
Show diff stats
bower.json
| @@ -41,6 +41,12 @@ | @@ -41,6 +41,12 @@ | ||
| 41 | "assets/fonts/bootstrap/glyphicons-halflings-regular.woff", | 41 | "assets/fonts/bootstrap/glyphicons-halflings-regular.woff", |
| 42 | "assets/fonts/bootstrap/glyphicons-halflings-regular.woff2" | 42 | "assets/fonts/bootstrap/glyphicons-halflings-regular.woff2" |
| 43 | ] | 43 | ] |
| 44 | + }, | ||
| 45 | + "font-awesome": { | ||
| 46 | + "main": [ | ||
| 47 | + "scss/font-awesome.scss", | ||
| 48 | + "fonts/*" | ||
| 49 | + ] | ||
| 44 | } | 50 | } |
| 45 | }, | 51 | }, |
| 46 | "resolutions": { | 52 | "resolutions": { |
gulp/build.js
| @@ -53,6 +53,7 @@ gulp.task('html', ['inject', 'partials'], function () { | @@ -53,6 +53,7 @@ gulp.task('html', ['inject', 'partials'], function () { | ||
| 53 | .pipe(cssFilter) | 53 | .pipe(cssFilter) |
| 54 | .pipe($.sourcemaps.init()) | 54 | .pipe($.sourcemaps.init()) |
| 55 | .pipe($.replace('../../bower_components/bootstrap-sass/assets/fonts/bootstrap/', '../fonts/')) | 55 | .pipe($.replace('../../bower_components/bootstrap-sass/assets/fonts/bootstrap/', '../fonts/')) |
| 56 | + .pipe($.replace('../../bower_components/font-awesome/fonts/', '../fonts/')) | ||
| 56 | .pipe($.minifyCss({ processImport: false })) | 57 | .pipe($.minifyCss({ processImport: false })) |
| 57 | .pipe($.sourcemaps.write('maps')) | 58 | .pipe($.sourcemaps.write('maps')) |
| 58 | .pipe(cssFilter.restore) | 59 | .pipe(cssFilter.restore) |