Scatterplot smaller, card

This commit is contained in:
Colin Megill
2018-02-28 09:55:09 -08:00
parent e3248fe34a
commit 1825f289b7
3 changed files with 24 additions and 17 deletions
+10 -3
View File
@@ -154,16 +154,23 @@ class Scatterplot extends React.Component {
render() { render() {
return ( return (
<div id="scatterplot_wrapper"> <div
style={{
backgroundColor: "white",
borderRadius: 3,
marginTop: 15,
paddingBottom: 20,
boxShadow: "3px 4px 13px 0px rgba(201,201,201,1)",
}}
id="scatterplot_wrapper">
<div <div
className={styles.scatterplot} className={styles.scatterplot}
id="scatterplot" id="scatterplot"
style={{ style={{
width: width + margin.left + margin.right + "px", width: width + margin.left + margin.right + "px",
height: height + margin.top + margin.bottom + "px", height: height + margin.top + margin.bottom + "px",
marginBottom: 60
}} }}
>scatter</div> ></div>
</div> </div>
) )
} }
@@ -23,8 +23,8 @@ const setupScatterplot = (
.attr("height", height * devicePixelRatio) .attr("height", height * devicePixelRatio)
.style("width", width + "px") .style("width", width + "px")
.style("height", height + "px") .style("height", height + "px")
.style("margin-left", 10 + 3 + "px") /* magic number: this seems to be visually correct when it is equal to the amount axis is translated by plus or minus... a little? */ .style("margin-left", margin.left + 1 + "px") /* magic number: this seems to be visually correct when it is equal to the amount axis is translated by plus or minus... a little? */
.style("margin-top", margin.top + margin.bottom - 2 + "px") .style("margin-top", margin.top + "px")
var ctx = canvas.node().getContext("2d"); var ctx = canvas.node().getContext("2d");
ctx.globalCompositeOperation = 'darken'; ctx.globalCompositeOperation = 'darken';
+3 -3
View File
@@ -1,11 +1,11 @@
import _ from "lodash"; import _ from "lodash";
const paddingRight = 120; const paddingRight = 120;
const continuousChartWidth = 1200; const continuousChartWidth = 340;
export const margin = {top: 66, right: 110, bottom: 20, left: 60}; export const margin = {top: 66, right: 110, bottom: 20, left: 60};
export const width = continuousChartWidth - margin.left - margin.right - paddingRight; export const width = 340;
export const height = 680 - margin.top - margin.bottom; export const height = 340 - margin.top - margin.bottom;
export const innerHeight = height - 2; export const innerHeight = height - 2;
export const devicePixelRatio = window.devicePixelRatio || 1; export const devicePixelRatio = window.devicePixelRatio || 1;