diff --git a/Gruntfile.js b/Gruntfile.js index aad8eba4..5be36f82 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -29,7 +29,10 @@ module.exports = function(grunt){ // clean everything clean: { - build: ['<%= config.site %>'] + build: [ + '<%= config.site %>/*', + '!<%= config.site %>/media' + ] }, // Jekyll @@ -41,6 +44,7 @@ module.exports = function(grunt){ // options: { // lsi: true // } + src: '<%= config.src %>/' }, serve: { src: '<%= config.src %>/' @@ -124,11 +128,10 @@ module.exports = function(grunt){ expand: true, cwd: '<%= config.site %>/', src: ['*.png'], - dest: '<%= config.site %>/', - ext: '.png' + dest: '<%= config.site %>/' } ] - }, + } }, // dev server @@ -234,7 +237,7 @@ module.exports = function(grunt){ 'clean', 'rsync:copy_media', 'jekyll:production', - 'imagemin', + //'imagemin', 'less', 'cmq', 'cssmin', diff --git a/_config.yml b/_config.yml index 05c40fa6..af9ac4ca 100644 --- a/_config.yml +++ b/_config.yml @@ -42,7 +42,7 @@ picture: markup: "picturefill" presets: default: - ppi: [1, 1.5] + ppi: [1, 1.5, 2] attr: itemprop: "image" source_medium: @@ -54,7 +54,7 @@ picture: source_default: width: "320" featured: - ppi: [1, 1.5] + ppi: [1, 1.5, 2] attr: class: "featured-image" itemprop: "image"