Add sass compiling and move all css stuff to /css

dbisso · Jun 18, 2014 · 4ac1a41 · 4ac1a41
1 parent 240499a
commit 4ac1a41
Show file tree

Hide file tree

Showing 7 changed files with 1,935 additions and 67 deletions.
diff --git a/.sass-cache/05c5790cf810b9831aca22aa85db3ed406bda2ae/style.scssc b/.sass-cache/05c5790cf810b9831aca22aa85db3ed406bda2ae/style.scssc
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -36,11 +36,22 @@ module.exports = function(grunt) {
 			},
 			minify: {
 				expand: true,
-				src: ['style.css'],
+				src: ['css/style.css'],
 				// dest: '',
 				ext: '.min.css'
 			}
 		},
+		sass: {
+			dist: {
+				options: {
+					style: 'expanded',
+					lineNumbers: true
+				},
+				files: {
+				  'css/style.css': 'css/style.scss',
+				}
+			}
+		},
 		jshint: {
 			all: [
 				'Gruntfile.js',
@@ -82,11 +93,10 @@ module.exports = function(grunt) {
 		},
 		watch:  {
 
-			css: {
-				files: ['style.css'],
-				tasks: ['cssmin']
+			sass: {
+				files: ['**/*.scss'],
+				tasks: ['sass', 'cssmin']
 			},
-
 			scripts: {
 				files: ['js/cmb.js'],
 				tasks: ['jshint', 'uglify'],
@@ -105,8 +115,9 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-contrib-cssmin');
 	grunt.loadNpmTasks('grunt-contrib-watch');
+	grunt.loadNpmTasks('grunt-contrib-sass');
 	// grunt.loadNpmTasks('grunt-contrib-concat');
 
-	grunt.registerTask('default', ['jshint', 'cssmin', 'uglify', 'phpunit']);
+	grunt.registerTask('default', ['jshint', 'sass', 'cssmin', 'uglify', 'phpunit']);
 	grunt.registerTask('tests', ['jshint', 'phpunit']);
 };