From: Laury GvR Date: Thu, 26 Feb 2015 15:07:13 +0000 (-0500) Subject: Initial Laury commit X-Git-Tag: v1.0.1~1 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d87d0702889c8b1165d5f041f0a823fe70eaedb0;p=WP-Themes%2Fgilmoremuseum.git Initial Laury commit --- diff --git a/Gruntfile.js b/Gruntfile.js index 8da6324..753734c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -12,23 +12,73 @@ module.exports = function(grunt) { }, files: { 'css/app.css': 'scss/app.scss' - } + } } }, + copy: { + scripts: { + expand: true, + cwd: 'bower_components/', + src: '**/*.js', + dest: 'js' + }, + + maps: { + expand: true, + cwd: 'bower_components/', + src: '**/*.map', + dest: 'js' + } + }, + + uglify: { + dist: { + files: { + 'js/modernizr/modernizr.min.js': ['js/modernizr/modernizr.js'] + } + } + }, + + concat: { + options: { + separator: ';' + }, + dist: { + src: [ + 'js/dollarsign.js', + 'js/foundation/js/foundation.min.js', + 'js/custom/*.js', + ], + + dest: 'js/app.js' + } + + }, + watch: { grunt: { files: ['Gruntfile.js'] }, sass: { - files: 'scss/**/*.scss', + files: 'scss/**/*.{scss,sass}', tasks: ['sass'] + }, + + scripts: { + files: ['js/custom/*.js'], + tasks: ['concat', 'uglify'] } + } }); grunt.loadNpmTasks('grunt-sass'); grunt.loadNpmTasks('grunt-contrib-watch'); + grunt.loadNpmTasks('grunt-contrib-concat'); + grunt.loadNpmTasks('grunt-contrib-copy'); + grunt.loadNpmTasks('grunt-contrib-uglify'); - grunt.registerTask('build', ['sass']); - grunt.registerTask('default', ['build','watch']); -} \ No newline at end of file + grunt.registerTask('build', ['sass', 'copy', 'uglify', 'concat']); + grunt.registerTask('runwatch', ['sass','uglify', 'concat']); + grunt.registerTask('default', ['runwatch','watch']); +} diff --git a/footer.php b/footer.php index c3f969c..bf92ccc 100644 --- a/footer.php +++ b/footer.php @@ -1,6 +1,6 @@
-

The Gilmore Car Musuem

+

The Gilmore Car Musuem

6865 W Hickory Rd. Hickory Corners, MI 49060 • 269-671-5089 • Directions