Makin’ a website.

Gruntfile.js

@@ -14,16 +14,14 @@ module.exports = function(grunt) {
 				'* Copyright (c) <%= grunt.template.today("yyyy") %> ' +
 				'Authored by Filament Group, Inc. */',
 		clean: {
-			dist: [ "_dist/" ],
-			grunticon: [ ".grunticon-temp" ]
+			dist: [ "_dist/" ]
 		},
 		concat: {
 			options: {
 				banner: '<%= banner %>'
 			},
 			js_initial: {
 				src: [
-					'_tmpl/_js/_lib/modernizr.js',
 					'_tmpl/_js/app-globals.js',
 					'_tmpl/_js/initial.config.js'
 				],
@@ -32,6 +30,8 @@ module.exports = function(grunt) {
 			js_main: {
 				src: [
 					// keep this globalenhance file last!
+					'_tmpl/_js/_lib/jquery.js',
+					'_tmpl/_js/_lib/*',
 					'_tmpl/_js/globalenhance.js'
 				],
 				dest: '_dist/_js/main.js'
@@ -53,18 +53,12 @@ module.exports = function(grunt) {
 		copy: {
 			dist: {
 				files: [
-					{ expand: true, cwd: '_tmpl/docs/', src: ["*.html"], dest: "_dist/docs/" },
 					{ expand: true, cwd: '_tmpl/_includes/', src: ["**"], dest: "_dist/_includes/" },
 					{ expand: true, cwd: "_tmpl/_img/", src: ["**"], dest: "_dist/_img/" },
 					{ expand: true, cwd: "_tmpl/_img/svg/", src: ["*.png"], dest: "_dist/_img/_svg/" },
-					{ expand: true, cwd: "_tmpl/_css/_img/", src: ["**"], dest: "_dist/_css/_img/" },
+					{ expand: true, cwd: "_tmpl/_css/", src: ["**"], dest: "_dist/_css/" },
 					{ expand: true, cwd: "_tmpl/", src: ["*.html","*.php","*.json"], dest: "_dist/" },
 					{ expand: true, cwd: "_tmpl/", src: [".htaccess"], dest: "_dist/" }]
-			},
-			grunticon: {
-				files: [
-					{ expand: true, cwd: "_tmpl/_css/_svg/", src: ["**"], dest: ".grunticon-temp" }
-				]
 			}
 		},
 		watch: {
@@ -85,10 +79,6 @@ module.exports = function(grunt) {
 			js: {
 				files: ['_tmpl/_js/**/*'],
 				tasks: 'watch-js'
-			},
-			grunticon: {
-				files: ['_tmpl/_css/_svg/*'],
-				tasks: 'watch-grunticon'
 			}
 		},
 		cssmin: {
@@ -127,37 +117,6 @@ module.exports = function(grunt) {
 				dest: '<%= concat.js_respond.dest %>'
 			}
 		},
-		svgmin: {                                           // Task
-			options: {                                      // Configuration that will be passed directly to SVGO
-				plugins: [{
-					removeViewBox: false
-				}]
-			},
-			tmpl: {
-				files: [
-					{
-						expand: true,
-						cwd: '.grunticon-temp/',
-						src: ['**/*.svg'],
-									dest: '.grunticon-temp/'
-						}
-				]
-			}
-		},
-		grunticon: {
-			all: {
-				options: {
-					src: ".grunticon-temp/",
-					dest: "_dist/_css/_grunticon/",
-					svgo: true,
-					pngcrush: false,
-					cssbasepath: "/",
-					colors: {
-						"green": "#0C756D"
-					}
-				}
-			}
-		},
 		criticalcss: {
 			custom_options: {
 				options: {
@@ -198,21 +157,10 @@ module.exports = function(grunt) {
 		'qunit',
 		'concat',
 		'copy',
-		'svgmin',
-		'grunticon',
 		'criticalcss',
 		'chmod:readonly'
 	]);
 
-	grunt.registerTask('icons', [
-		'chmod:writeable',
-		'clean:grunticon',
-		'copy:grunticon',
-		'svgmin',
-		'grunticon',
-		'chmod:readonly'
-	]);
-
 	// NOTE these watch tasks try to run only relevant tasks per file save
 
 	grunt.registerTask('watch-endpoints', [
@@ -225,12 +173,12 @@ module.exports = function(grunt) {
 		'chmod:writeable',
 		'qunit',
 		'copy',
-		'svgmin',
 		'chmod:readonly'
 	]);
 
 	grunt.registerTask('watch-css', [
 		'chmod:writeable',
+		'copy',
 		'concat:css_main',
 		'chmod:readonly'
 	]);
@@ -240,27 +188,15 @@ module.exports = function(grunt) {
 		'concat:js_initial',
 		'concat:js_main',
 		'concat:js_respond',
-		'concat:js_docs',
-		'chmod:readonly'
-	]);
-
-	grunt.registerTask('watch-grunticon', [
-		'chmod:writeable',
-		'clean:grunticon',
-		'copy:grunticon',
-		'svgmin',
-		'grunticon',
 		'chmod:readonly'
 	]);
 
 	grunt.registerTask('stage', [
 		'clean',
 		'qunit',
+		'copy',
 		'concat',
 		'cssmin',
-		'uglify',
-		'copy',
-		'svgmin',
-		'grunticon'
+		'uglify'
 	]);
 };