diff --git a/.gitignore b/.gitignore index 54ccdc6a..5643c872 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ node_modules bower_components -generated \ No newline at end of file +_site \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index 8839a08e..c32380de 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,7 +4,7 @@ module.exports = function(grunt){ // config var gruntConfig = { src: '_src', - site: 'generated', + site: '_site', assets: { less: 'assets/less', css: 'assets/css', diff --git a/README.md b/README.md index 58b17bb7..df17b9e4 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,11 @@ Get up and running For various reasons the assets build process and Jekyll site generation is managed through Grunt instead of `jekyll` or `rake`. -Both, `grunt server` and `grunt build`, use [grunt-jekyll](https://github.com/dannygarcia/grunt-jekyll) to first generate the site into the `generated` folder and the following Grunt tasks output into that folder. +Both, `grunt server` and `grunt build`, use [grunt-jekyll](https://github.com/dannygarcia/grunt-jekyll) to first generate the site into the `_site` folder and the following Grunt tasks output into that folder. -The `media` folder holding the source post images is excluded from Jekyll site generation and rsynced around from `_src/_media` to `generated/media` before site generation starts. +The `media` folder holding the source post images is excluded from Jekyll site generation and rsynced around from `_src/_media` to `_site/media` before site generation starts. -Image size generation for post teaser images and photos is done with [jekyll-picture-tag](https://github.com/robwierzbowski/jekyll-picture-tag), putting resized images into `generated/media/gen`. +Image size generation for post teaser images and photos is done with [jekyll-picture-tag](https://github.com/robwierzbowski/jekyll-picture-tag), putting resized images into `_site/media/gen`. ### Install dependencies diff --git a/_config.yml b/_config.yml index 0723c016..1f460f85 100644 --- a/_config.yml +++ b/_config.yml @@ -43,7 +43,7 @@ redcarpet: # -------------------- source: ./_src -destination: ./generated +destination: ./_site exclude: ['less', 'app.js'] keep_files: ['media', 'gen']