Merge branch 'master' of https://github.com/novus/nvd3 into development

Conflicts: nv.d3.min.js
11 years ago · 18b6fd4cbf
parent 80dd13db90 0983d3a40a
commit 18b6fd4cbf
3 changed files with 11 additions and 3 deletions
--- a/nv.d3.js
+++ b/nv.d3.js
@ -11548,7 +11548,7 @@ nv.models.stackedArea = function() {

  scatter
    .size(2.2) // default size
-    .sizeDomain([2.2]) // all the same size by default
+    .sizeDomain([2.2,2.2]) // all the same size by default
    ;

  /************************************
--- a/nv.d3.min.js
+++ b/nv.d3.min.js
--- a/src/models/stackedArea.js
+++ b/src/models/stackedArea.js
@ -25,7 +25,7 @@ nv.models.stackedArea = function() {

  scatter
    .size(2.2) // default size
-    .sizeDomain([2.2]) // all the same size by default
+    .sizeDomain([2.2,2.2]) // all the same size by default
    ;

  /************************************