Merge branch 'release-2.4.0-b2' into releases

archetyped · May 7, 2014 · 119d261 · 119d261
2 parents 8a6e385 + c7c6500
commit 119d261
Show file tree

Hide file tree

Showing 18 changed files with 1,351 additions and 1,117 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -20,7 +20,7 @@ module.exports = function(grunt) {
 
 			// JavaScript assets
 			js : {
-				base : 'js', //Base dir
+				base : 'js', // Base dir
 				src : '<%= paths.js.base %>/dev', // Development code
 				dest : '<%= paths.js.base %>/prod', // Production code
 				files_std : '**/<%= paths.js.src %>/**/*.js', // Standard file match
@@ -34,8 +34,8 @@ module.exports = function(grunt) {
 				ext : '.css', // Compiled extension
 				target : '*.scss', // Only Sass files in CWD
 				exclude : '!_*.scss', // Do not process partials
-				base_src : '<%= paths.base %>/<%= paths.sass.src %>', //Base source dir
-				base_dest : '<%= paths.base %>/<%= paths.sass.dest %>', //Base compile dir
+				base_src : '<%= paths.base %>/<%= paths.sass.src %>', // Base source dir
+				base_dest : '<%= paths.base %>/<%= paths.sass.dest %>', // Base compile dir
 			}
 		},
 	});