Mercurial > piecrust2

diff gulpfile.js @ 1069:dff873f11541

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
admin: Upgrade Bootstrap, switch icons to Open-Iconic, remove Bower.
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 13 Feb 2018 23:22:27 -0800
parents 4d0f80b2ba7f
children 7eb58b5748eb
line wrap: on
line diff
--- a/gulpfile.js	Tue Feb 13 23:21:00 2018 -0800
+++ b/gulpfile.js	Tue Feb 13 23:22:27 2018 -0800
@@ -17,8 +17,8 @@
             errLogToConsole: true,
             outputStyle: 'compressed',
             includePaths: [
-                'bower_components/bootstrap-sass/assets/stylesheets',
-                'bower_components/Ionicons/scss']}))
+                'node_modules/bootstrap/scss',
+                'node_modules/open-iconic/font/css']}))
         .pipe(cssnano())
         //.pipe(sourcemaps.write())
         .pipe(rename({suffix: '.min'}))
@@ -31,15 +31,9 @@
 // Javascript
 gulp.task('js', function() {
     return gulp.src([
-            'bower_components/jquery/dist/jquery.js',
-            'bower_components/bootstrap-sass/assets/javascripts/bootstrap/alert.js',
-            'bower_components/bootstrap-sass/assets/javascripts/bootstrap/button.js',
-            'bower_components/bootstrap-sass/assets/javascripts/bootstrap/collapse.js',
-            'bower_components/bootstrap-sass/assets/javascripts/bootstrap/dropdown.js',
-            'bower_components/bootstrap-sass/assets/javascripts/bootstrap/modal.js',
-            'bower_components/bootstrap-sass/assets/javascripts/bootstrap/tooltip.js',
-            'bower_components/bootstrap-sass/assets/javascripts/bootstrap/transition.js',
-            'bower_components/jquery-timeago/jquery.timeago.js',
+            'node_modules/jquery/dist/jquery.min.js',
+            'node_modules/bootstrap/dist/js/bootstrap.min.js',
+            'node_modules/timeago/jquery.timeago.js',
             'piecrust/admin/assets/js/**/*.js'
             ])
         .pipe(sourcemaps.init())
@@ -56,15 +50,13 @@
 // Fonts/images
 gulp.task('fonts', function() {
     return gulp.src([
-            'bower_components/bootstrap-sass/assets/fonts/bootstrap/*',
-            'bower_components/Ionicons/fonts/*'
+            'node_modules/open-iconic/font/fonts/*'
         ])
         .pipe(gulp.dest('piecrust/admin/static/fonts'));
 });
 
 gulp.task('images', function() {
     return gulp.src([
-            'bower_components/bootstrap-sass/assets/images/*',
             'piecrust/admin/assets/img/*'
         ])
         .pipe(gulp.dest('piecrust/admin/static/img'));