summaryrefslogtreecommitdiff
path: root/Gruntfile.js
diff options
context:
space:
mode:
authorEliot Whalan <ewhal@pantsu.cat>2016-06-14 09:00:31 +0200
committerEliot Whalan <ewhal@pantsu.cat>2016-06-14 09:00:31 +0200
commit3293b44e1e52d09dbafde0f49b11fbe531c0f8c6 (patch)
tree897eda84bf63c5ff5ac7b4261ffd8b6b8eccc00e /Gruntfile.js
parenta31dbdce7181388e68da07c30e8ac7ed249ccfeb (diff)
Revert "Remove grunt-contrib-imagemin image minification"
This reverts commit 90e6b7bdfeccff5e96f0bda23bc5c9ab7b33238a.
Diffstat (limited to 'Gruntfile.js')
-rw-r--r--Gruntfile.js15
1 files changed, 15 insertions, 0 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 26209b1..0cb7d9c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -63,6 +63,16 @@ module.exports = function (grunt) {
}
}
},
+ imagemin: {
+ dist: {
+ files: [{
+ expand: true,
+ cwd: 'img/',
+ src: '**/*.{png,jpg,gif}',
+ dest: 'dist/img/'
+ }]
+ }
+ },
copy: {
dist: {
files: [{
@@ -85,7 +95,12 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-htmlmin');
grunt.loadNpmTasks('grunt-contrib-cssmin');
+ grunt.loadNpmTasks('grunt-contrib-imagemin');
grunt.loadNpmTasks('grunt-contrib-copy');
+<<<<<<< HEAD
grunt.registerTask('default', ['swig', 'htmlmin', 'cssmin', 'uglify', 'copy']);
+=======
+ grunt.registerTask('default', ['mkdir', 'swig', 'htmlmin', 'cssmin', 'uglify', 'imagemin', 'copy']);
+>>>>>>> parent of 90e6b7b... Remove grunt-contrib-imagemin image minification
};