merge grunt update to 0.4 (#350)

This commit is contained in:
Hakim El Hattab 2013-02-27 13:20:24 -05:00
parent 9f1c5a0cea
commit 3f740c8553
3 changed files with 11 additions and 12 deletions

2
css/reveal.min.css vendored

File diff suppressed because one or more lines are too long

View file

@ -5,7 +5,7 @@ module.exports = function(grunt) {
grunt.initConfig({ grunt.initConfig({
pkg: grunt.file.readJSON('package.json'), pkg: grunt.file.readJSON('package.json'),
meta: { meta: {
banner: banner:
'/*!\n' + '/*!\n' +
' * reveal.js <%= pkg.version %> (<%= grunt.template.today("yyyy-mm-dd, HH:MM") %>)\n' + ' * reveal.js <%= pkg.version %> (<%= grunt.template.today("yyyy-mm-dd, HH:MM") %>)\n' +
' * http://lab.hakim.se/reveal-js\n' + ' * http://lab.hakim.se/reveal-js\n' +
@ -25,13 +25,13 @@ module.exports = function(grunt) {
}, },
uglify: { uglify: {
options: { options: {
banner: '<%= meta.banner %> \n' banner: '<%= meta.banner %>\n'
}, },
build: { build: {
src: 'js/reveal.js', src: 'js/reveal.js',
dest: 'js/reveal.min.js' dest: 'js/reveal.min.js'
} }
}, },
cssmin: { cssmin: {
@ -80,4 +80,3 @@ module.exports = function(grunt) {
grunt.registerTask( 'default', [ 'jshint', 'cssmin', 'uglify' ] ); grunt.registerTask( 'default', [ 'jshint', 'cssmin', 'uglify' ] );
}; };

4
js/reveal.min.js vendored

File diff suppressed because one or more lines are too long