Merge tag '2.0.0-beta.33' into develop

dc.js 2.0 beta 33

AUTHORS

@@ -85,3 +85,4 @@ Paul Mach <[email protected]>
 Fil <[email protected]>
 Mauricio Bustos <[email protected]>
 Anders Dalvander <[email protected]>
+Alexander Stillesjö <[email protected]>

Changelog.md

@@ -6,6 +6,10 @@
 
 # 2.0 Series
 ## 2.0.0 beta 33
+* Use Sass 3 (SCSS) for generating CSS, by Matt Traynham ([#1049](https://github.com/dc-js/dc.js/pull/1049))
+* Don't try to interpolate user data in label paths, by Alexander Stillesjö ([#1151](https://github.com/dc-js/dc.js/pull/1151))
+* Allow specifying the unit for padding the X axis, by Alexander Stillesjö (thanks also to Matt Traynham for the alternate implementation in [#892](https://github.com/dc-js/dc.js/pull/892))
+* Force dots to be shown with `.xyTipsOn('always')`, by Anders Dalvander ([#1152](https://github.com/dc-js/dc.js/issues/1152))
 * Use keyAccessor for box plots; fix ordinal boxplot brushing and whisker widths, by Matt Traynham ([#1022](https://github.com/dc-js/dc.js/pull/1022))
 * `transitionDelay` allows staggered transitions, by Mauricio Bustos ([#1116](https://github.com/dc-js/dc.js/pull/1116))
 * Removed the confusing callback from dc.transition and documented the function

Gruntfile.js

@@ -30,6 +30,13 @@ module.exports = function (grunt) {
                 dest: '<%= conf.pkg.name %>.js'
             }
         },
+        sass: {
+            dist: {
+                files: {
+                    '<%= conf.pkg.name %>.css': 'style/<%= conf.pkg.name %>.scss'
+                }
+            }
+        },
         uglify: {
             jsmin: {
                 options: {
@@ -91,9 +98,9 @@ module.exports = function (grunt) {
                 files: ['<%= conf.src %>/**/*.js', '<%= conf.web %>/stock.js'],
                 tasks: ['docs']
             },
-            styles: {
-                files: ['<%= conf.pkg.name %>.css'],
-                tasks: ['cssmin:main', 'copy:dc-to-gh']
+            sass: {
+                files: ['style/<%= conf.pkg.name %>.scss'],
+                tasks: ['sass', 'cssmin:main', 'copy:dc-to-gh']
             },
             jasmineRunner: {
                 files: ['<%= conf.spec %>/**/*.js'],
@@ -384,13 +391,13 @@ module.exports = function (grunt) {
             },
             runner: grunt.config('watch').jasmineRunner,
             scripts: grunt.config('watch').scripts,
-            styles: grunt.config('watch').styles
+            sass: grunt.config('watch').sass
         });
         grunt.task.run('watch');
     });
 
     // task aliases
-    grunt.registerTask('build', ['concat', 'uglify', 'cssmin']);
+    grunt.registerTask('build', ['concat', 'sass', 'uglify', 'cssmin']);
     grunt.registerTask('docs', ['build', 'copy', 'jsdoc', 'jsdoc2md', 'docco', 'fileindex']);
     grunt.registerTask('web', ['docs', 'gh-pages']);
     grunt.registerTask('server', ['docs', 'fileindex', 'jasmine:specs:build', 'connect:server', 'watch:jasmine-docs']);