Skip to content

C
c3-closed
Commit 90600ac7 authored by Masayuki Tanaka's avatar Masayuki Tanaka
Browse files
Options

Fix conflict

parents 27038291 7f181280
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
c3.js
View file @ 90600ac7
......@@ -336,13 +336,13 @@
subXOrient = __axis_rotated ? "left" : "bottom";
var translate = {
main : function () { return "translate(" + margin.left + "," + margin.top + ")"; },
context : function () { return "translate(" + margin2.left + "," + margin2.top + ")"; },
main : function () { return "translate(" + (Math.ceil(margin.left) + 0.5) + "," + (Math.ceil(margin.top) + 0.5) + ")"; },
context : function () { return "translate(" + (Math.ceil(margin2.left) + 0.5) + "," + (Math.ceil(margin2.top) + 0.5) + ")"; },
legend : function () { return "translate(" + margin3.left + "," + margin3.top + ")"; },
x : function () { return "translate(0," + (__axis_rotated ? 0 : height) + ")"; },
y : function () { return "translate(0," + (__axis_rotated ? height : 0) + ")"; },
y2 : function () { return "translate(" + (__axis_rotated ? 0 : width) + "," + (__axis_rotated ? 1 : 0) + ")"; },
subx : function () { return "translate(0," + (__axis_rotated ? 0 : height2) + ")"; },
subx : function () { return "translate(0," + (__axis_rotated ? 0 : Math.ceil(height2)) + ")"; },
arc: function () { return "translate(" + width / 2 + "," + height / 2 + ")"; }
};
......
c3.min.js
View file @ 90600ac7
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment