Merge branch 'live-reload' of https://github.com/danielwegener/reveal.js into dev

This commit is contained in:
Hakim El Hattab 2013-12-10 11:37:50 +01:00
commit b7fcd71c9f
2 changed files with 11 additions and 3 deletions

View File

@ -80,7 +80,9 @@ module.exports = function(grunt) {
server: {
options: {
port: port,
base: '.'
base: '.',
livereload: true,
open: true
}
}
},
@ -97,6 +99,9 @@ module.exports = function(grunt) {
},
watch: {
options: {
livereload: true
},
main: {
files: [ 'Gruntfile.js', 'js/reveal.js', 'css/reveal.css' ],
tasks: 'default'
@ -104,6 +109,9 @@ module.exports = function(grunt) {
theme: {
files: [ 'css/theme/source/*.scss', 'css/theme/template/*.scss' ],
tasks: 'themes'
},
html: {
files: [ 'index.html']
}
}

View File

@ -33,7 +33,7 @@
"grunt-contrib-uglify": "~0.2.4",
"grunt-contrib-watch": "~0.5.3",
"grunt-contrib-sass": "~0.5.0",
"grunt-contrib-connect": "~0.4.1",
"grunt-contrib-connect": "~0.5.0",
"grunt-zip": "~0.7.0",
"grunt": "~0.4.0"
},