Merge pull request #589 from 0dp/patch-4

Fix copy-assets - Can confirm the bug.
Thx @0dp, @Thomas-A-Reinert and @axlright 👍 🥇
This commit is contained in:
Holger 2018-03-07 10:07:05 +01:00 committed by GitHub
commit 2ab8c6a88f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions

View File

@ -225,12 +225,11 @@ gulp.task('copy-assets', function() {
// Copy all Bootstrap SCSS files // Copy all Bootstrap SCSS files
gulp.src(paths.node + 'bootstrap/scss/**/*.scss') gulp.src(paths.node + 'bootstrap/scss/**/*.scss')
.pipe(gulp.dest(paths.dev + '/sass/bootstrap4')); .pipe(gulp.dest(paths.dev + '/sass/bootstrap4'));
return stream;
////////////////// End Bootstrap 4 Assets ///////////////////////// ////////////////// End Bootstrap 4 Assets /////////////////////////
// Copy all Font Awesome Fonts // Copy all Font Awesome Fonts
var stream = gulp.src(paths.node + 'font-awesome/fonts/**/*.{ttf,woff,woff2,eof,svg}') gulp.src(paths.node + 'font-awesome/fonts/**/*.{ttf,woff,woff2,eot,svg}')
.pipe(gulp.dest('./fonts')); .pipe(gulp.dest('./fonts'));
// Copy all Font Awesome SCSS files // Copy all Font Awesome SCSS files
@ -260,7 +259,7 @@ gulp.task('copy-assets', function() {
// Deleting the files distributed by the copy-assets task // Deleting the files distributed by the copy-assets task
gulp.task('clean-vendor-assets', function () { gulp.task('clean-vendor-assets', function () {
return del([paths.dev+'/js/bootstrap4/**', paths.dev+'/sass/bootstrap4/**', './fonts/*wesome*.{ttf,woff,woff2,eof,svg}', paths.dev+'/sass/fontawesome/**', paths.dev+'/sass/underscores/**', paths.dev+'/js/skip-link-focus-fix.js', paths.js+'/**/skip-link-focus-fix.js', paths.js+'/**/popper.min.js', paths.js+'/**/popper.js', (paths.vendor!=''?(paths.js+paths.vendor+'/**'):'')]); return del([paths.dev+'/js/bootstrap4/**', paths.dev+'/sass/bootstrap4/**', './fonts/*wesome*.{ttf,woff,woff2,eot,svg}', paths.dev+'/sass/fontawesome/**', paths.dev+'/sass/underscores/**', paths.dev+'/js/skip-link-focus-fix.js', paths.js+'/**/skip-link-focus-fix.js', paths.js+'/**/popper.min.js', paths.js+'/**/popper.js', (paths.vendor!=''?(paths.js+paths.vendor+'/**'):'')]);
}); });
// Run // Run