Sass compilation using Grunt

nDmitry · Dec 25, 2013 · bf4ba82 · bf4ba82
1 parent c13f1e3
commit bf4ba82
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 54 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 .idea
+.sass-cache
 node_modules
 npm-debug.log
 tmp
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -23,6 +23,23 @@ module.exports = function(grunt) {
             },
         },
 
+        sass: {
+            dist: {
+                files: {
+                    'test/fixtures/sm.css': 'test/fixtures/sm.scss'
+                }
+            },
+            maps: {
+                options: {
+                    sourcemap: true
+                },
+                files: {
+                    'test/fixtures/sm_update.css': 'test/fixtures/sm_update.scss',
+                    'test/fixtures/sm_update_by_path.css': 'test/fixtures/sm_update_by_path.scss'
+                }
+            }
+        },
+
         clean: {
             tests: ['tmp'],
         },
@@ -106,7 +123,7 @@ module.exports = function(grunt) {
 
     grunt.loadTasks('tasks');
 
-    grunt.registerTask('test', ['clean', 'copy', 'autoprefixer', 'nodeunit']);
+    grunt.registerTask('test', ['sass', 'clean', 'copy', 'autoprefixer', 'nodeunit']);
     grunt.registerTask('default', ['jshint', 'test']);
 
 };
diff --git a/Makefile b/Makefile
diff --git a/package.json b/package.json
@@ -32,14 +32,15 @@
   },
   "dependencies": {
     "autoprefixer": "~1.0.20131222",
-    "diff": "~1.0.7"
+    "diff": "~1.0.8"
   },
   "devDependencies": {
     "grunt": "~0.4.2",
     "grunt-contrib-jshint": "~0.7.2",
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-nodeunit": "~0.2.2",
     "grunt-contrib-copy": "~0.4.1",
+    "grunt-contrib-sass": "~0.6.0",
     "load-grunt-tasks": "~0.2.1"
   },
   "peerDependencies": {

diff --git a/test/expected/sm.css b/test/expected/sm.css
@@ -1,11 +1,11 @@
 .bg1 {
-  background: -webkit-linear-gradient(#000, #111);
-  background: -moz-linear-gradient(#000, #111);
-  background: -o-linear-gradient(#000, #111);
-  background: linear-gradient(#000, #111); }
+  background: -webkit-linear-gradient(black, #111111);
+  background: -moz-linear-gradient(black, #111111);
+  background: -o-linear-gradient(black, #111111);
+  background: linear-gradient(black, #111111); }
 
 .bg2 {
-  background: -webkit-linear-gradient(#111, #222);
-  background: -moz-linear-gradient(#111, #222);
-  background: -o-linear-gradient(#111, #222);
-  background: linear-gradient(#111, #222); }
+  background: -webkit-linear-gradient(#111111, #222222);
+  background: -moz-linear-gradient(#111111, #222222);
+  background: -o-linear-gradient(#111111, #222222);
+  background: linear-gradient(#111111, #222222); }
diff --git a/test/expected/sm.css.map b/test/expected/sm.css.map
diff --git a/test/expected/sm_update.css b/test/expected/sm_update.css
diff --git a/test/expected/sm_update.css.map b/test/expected/sm_update.css.map
diff --git a/test/expected/sm_update_by_path.css b/test/expected/sm_update_by_path.css
diff --git a/test/expected/sm_update_by_path.css.map b/test/expected/sm_update_by_path.css.map
diff --git a/test/fixtures/sm.css b/test/fixtures/sm.css
@@ -1,5 +1,5 @@
 .bg1 {
-  background: linear-gradient(#000, #111); }
+  background: linear-gradient(black, #111111); }
 
 .bg2 {
-  background: linear-gradient(#111, #222); }
+  background: linear-gradient(#111111, #222222); }
diff --git a/test/fixtures/sm_update.css b/test/fixtures/sm_update.css
diff --git a/test/fixtures/sm_update.css.map b/test/fixtures/sm_update.css.map
diff --git a/test/fixtures/sm_update_by_path.css b/test/fixtures/sm_update_by_path.css
diff --git a/test/fixtures/sm_update_by_path.css.map b/test/fixtures/sm_update_by_path.css.map