diff --git a/Gruntfile.js b/Gruntfile.js index 12612129d0..036850c2de 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -75,6 +75,20 @@ module.exports = function(grunt) { sprite: sprite, + imagemin: { + spritesmith: { + options: { + optimizationLevel: 7 + }, + files: [{ + expand: true, + flatten: true, + src: ["common/dist/sprites/*.png"], + dest: "common/dist/sprites/" + }] + } + }, + cssmin: { dist: { options: { @@ -209,7 +223,7 @@ module.exports = function(grunt) { }); // Register tasks. - grunt.registerTask('compile:sprites', ['clean:sprite', 'sprite', 'cssmin']); + grunt.registerTask('compile:sprites', ['clean:sprite', 'sprite', 'imagemin', 'cssmin']); grunt.registerTask('build:prod', ['loadManifestFiles', 'clean:build', 'browserify', 'uglify', 'stylus', 'cssmin', 'copy:build', 'hashres','prepare:staticNewStuff']); grunt.registerTask('build:dev', ['browserify', 'stylus', 'prepare:staticNewStuff']); grunt.registerTask('build:test', ['test:prepare:translations', 'build:dev']); @@ -250,6 +264,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-concurrent'); grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-spritesmith'); + grunt.loadNpmTasks('grunt-contrib-imagemin'); grunt.loadNpmTasks('grunt-hashres'); grunt.loadNpmTasks('grunt-karma'); diff --git a/common/dist/sprites/spritesmith0.png b/common/dist/sprites/spritesmith0.png index 2652b49587..9933fec457 100644 Binary files a/common/dist/sprites/spritesmith0.png and b/common/dist/sprites/spritesmith0.png differ diff --git a/common/dist/sprites/spritesmith1.png b/common/dist/sprites/spritesmith1.png index 3fe957b127..a4d2c922f0 100644 Binary files a/common/dist/sprites/spritesmith1.png and b/common/dist/sprites/spritesmith1.png differ diff --git a/common/dist/sprites/spritesmith2.png b/common/dist/sprites/spritesmith2.png index fe36a933e8..4d3bed4906 100644 Binary files a/common/dist/sprites/spritesmith2.png and b/common/dist/sprites/spritesmith2.png differ diff --git a/common/dist/sprites/spritesmith3.png b/common/dist/sprites/spritesmith3.png index 1a7bf8a567..51996847df 100644 Binary files a/common/dist/sprites/spritesmith3.png and b/common/dist/sprites/spritesmith3.png differ diff --git a/common/dist/sprites/spritesmith4.png b/common/dist/sprites/spritesmith4.png index 46141b2e4b..44664a2515 100644 Binary files a/common/dist/sprites/spritesmith4.png and b/common/dist/sprites/spritesmith4.png differ diff --git a/common/dist/sprites/spritesmith5.png b/common/dist/sprites/spritesmith5.png index 8680b17f0e..de280dc74a 100644 Binary files a/common/dist/sprites/spritesmith5.png and b/common/dist/sprites/spritesmith5.png differ diff --git a/common/dist/sprites/spritesmith6.png b/common/dist/sprites/spritesmith6.png index f7a3f41c2f..b11c9e763c 100644 Binary files a/common/dist/sprites/spritesmith6.png and b/common/dist/sprites/spritesmith6.png differ diff --git a/package.json b/package.json index 8ba1ff5cb2..9e50e1ed02 100644 --- a/package.json +++ b/package.json @@ -92,6 +92,7 @@ "event-stream": "^3.2.2", "expect.js": "~0.2.0", "glob": "^4.3.5", + "grunt-contrib-imagemin": "^0.9.4", "istanbul": "^0.3.14", "karma": "~0.10.2", "karma-chai-plugins": "~0.1.0",