From 61b22cdb6ce10884daef47e411f7db55262eb7de Mon Sep 17 00:00:00 2001 From: Colin Megill Date: Sat, 23 Dec 2017 15:25:43 -0800 Subject: [PATCH] move color control to continuous --- src/components/continuous/continuous.js | 8 ++++++-- src/components/graph/graph.js | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/continuous/continuous.js b/src/components/continuous/continuous.js index ae196cfa..d47fcab0 100644 --- a/src/components/continuous/continuous.js +++ b/src/components/continuous/continuous.js @@ -8,6 +8,7 @@ import SectionHeader from "../framework/sectionHeader"; import setupParallelCoordinates from "./setupParallelCoordinates"; import drawAxes from "./drawAxes"; import drawLinesCanvas from "./drawLinesCanvas"; +import ColorControl from "../controls/color"; import { margin, @@ -131,8 +132,7 @@ class Continuous extends React.Component { render() { return ( -
- +
+
) } }; export default Continuous; + + +// diff --git a/src/components/graph/graph.js b/src/components/graph/graph.js index a95b00f1..49bfd785 100644 --- a/src/components/graph/graph.js +++ b/src/components/graph/graph.js @@ -4,7 +4,6 @@ import styles from "./graph.css"; import {setupGraphElements, drawGraph} from "./drawGraph"; import SectionHeader from "../framework/sectionHeader"; import { connect } from "react-redux"; -import ColorControl from "../controls/color"; @connect((state) => { @@ -105,8 +104,6 @@ class Graph extends React.Component { render() { return (
- -
) @@ -114,3 +111,5 @@ class Graph extends React.Component { }; export default Graph; + +//