Merge pull request #9 from donini/1.2.0

Closing v 1.2.0

CHANGELOG.md

@@ -0,0 +1,10 @@
+## Changelog ##
+
+#### v1.2.0 - 14/10/2016 ####
+- Move images dir to assets dir #7
+- Add task to image minification in Grunt.js file #6
+- Correct prompt item name on menu #8
+
+#### v1.1.0 - 9/9/2016 ####
+- Change docs 
+- Correct some strings

Gruntfile.js

@@ -134,9 +134,9 @@ module.exports = function( grunt ) {
 		// GENERATE SPRITES
 		sprites: {
 			theme: {
-				src: ['source/wp-content/themes/<%= pkg.name %>/images/src/*.png'],
+				src: ['source/wp-content/themes/<%= pkg.name %>/assets/images/src/*.png'],
 				css: 'source/wp-content/themes/<%= pkg.name %>/assets/css/sass/_don_child_sprite.scss',
-				map: 'source/wp-content/themes/<%= pkg.name %>/images/don_child_sprite.png'
+				map: 'source/wp-content/themes/<%= pkg.name %>/assets/images/don_child_sprite.png'
 			}
 		},
 		// COMPILE SASS
@@ -278,14 +278,14 @@ module.exports = function( grunt ) {
 				}
 			},
 			imagesDon:{
-				files: ['source/wp-content/themes/DONFramework/images/src/*.png'],
+				files: ['source/wp-content/themes/DONFramework/assets/images/src/*.png'],
 				tasks: ['sprites:don'],
 				options:{
 					livereload: true
 				}
 			},
 			imagesTheme:{
-				files: ['source/wp-content/themes/<%= pkg.name %>/images/src/*.png'],
+				files: ['source/wp-content/themes/<%= pkg.name %>/assets/images/src/*.png'],
 				tasks: ['sprites:theme'],
 				options:{
 					livereload: true
@@ -298,6 +298,22 @@ module.exports = function( grunt ) {
 				]
 			}
 		},
+		// IMAGE OPTIMIZATION
+		imagemin: {
+			dist: {
+				options: {
+					optimizationLevel: 7,
+					progressive: true
+				},
+				files: [{
+					expand: true,
+					filter: 'isFile',
+					cwd: 'source/wp-content/themes/<%= pkg.name %>/assets/images/',
+					src: '**/*.{png,jpg,gif}',
+					dest: 'source/wp-content/themes/<%= pkg.name %>/assets/images/'
+				}]
+			}
+		},
 		// CLEAN TEMP FILES
 		clean: {
 			preDeploy: {
@@ -309,7 +325,7 @@ module.exports = function( grunt ) {
 				'build/files/wp-content/themes/<%= pkg.name %>/assets/css/sass',
 				'build/files/wp-content/themes/<%= pkg.name %>/assets/js/src',
 				'build/files/wp-content/themes/<%= pkg.name %>/assets/js/vendor',
-				'build/files/wp-content/themes/<%= pkg.name %>/images/src',
+				'build/files/wp-content/themes/<%= pkg.name %>/assets/images/src',
 				'build/**/*md'
 				]
 			},
@@ -359,7 +375,7 @@ module.exports = function( grunt ) {
 						},
 						{
 							value: 'watch',
-							name: '8) Watch for file changes'
+							name: '9) Watch for file changes'
 						},
 						{
 							value: 'exit',
@@ -638,10 +654,10 @@ module.exports = function( grunt ) {
 
 		// BUILD ALL ASSETS
 		grunt.registerTask('buildAssets', function(){
-			var tasks = ['sprites', 'buildStyle', 'buildScript'];
+			var tasks = ['sprites', 'buildStyle', 'buildScript', 'imagemin'];
 			grunt.task.run(tasks);
 		}).registerTask('ba', function(){
-			var tasks = ['sprites', 'buildStyle', 'buildScript'];
+			var tasks = ['sprites', 'buildStyle', 'buildScript', 'imagemin'];
 			grunt.task.run(tasks);
 		});
 

README.md

@@ -137,7 +137,7 @@ grunt create        [OR]        grunt c
 
 ### 6) Build Assets
 
-To build all styles<sup>2</sup>, javascript and create sprite file, type this:
+To build all styles<sup>2</sup>, javascript, minify images and create sprite file, type this:
 
 ```shell
 grunt buildAssets        [OR]        grunt ba
@@ -211,3 +211,5 @@ grunt watch        [OR]        grunt w
 ## Suggest new features and register issues
 
 Use the Issues menu of this repository to register issues, doubts and suggest new features.
+
+See [changelog](./CHANGELOG.md) of project.

package.json

@@ -29,6 +29,7 @@
     "grunt-contrib-connect": "*",
     "grunt-contrib-copy": "*",
     "grunt-contrib-cssmin": "*",
+    "grunt-contrib-imagemin": "*",
     "grunt-contrib-jshint": "*",
     "grunt-contrib-nodeunit": "*",
     "grunt-contrib-sass": "*",