diff options
author | Julia McCauley <skurvyj@gmail.com> | 2021-04-20 11:29:24 -0400 |
---|---|---|
committer | Julia McCauley <skurvyj@gmail.com> | 2021-04-20 11:29:24 -0400 |
commit | 0f86bfc8182dd6b8559f352ebad7ff5ea8db8c73 (patch) | |
tree | 385c86356e7f95058c72aaa1f1fbbe6abe492c6d /react-frontend/src/components/TimeSelector.js | |
parent | 8535db483bd2a153013976a0ad540d00707405ba (diff) | |
parent | 3910a31e5418343e427305bb0b77cf5ec3e2dfbf (diff) |
Merge branch 'master' of github.com:cs0320-2021/term-project-cohwille-jmccaul3-mfoiani-rhunt2
# Conflicts:
# react-frontend/src/components/Visualization.js
Diffstat (limited to 'react-frontend/src/components/TimeSelector.js')
-rw-r--r-- | react-frontend/src/components/TimeSelector.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/react-frontend/src/components/TimeSelector.js b/react-frontend/src/components/TimeSelector.js index 652a9ec..997494d 100644 --- a/react-frontend/src/components/TimeSelector.js +++ b/react-frontend/src/components/TimeSelector.js @@ -34,9 +34,8 @@ function TimeSelector(props) { <DateSelector side={"left"} name={"Start Date"} className="Coord-select-left" clickedFunc={setCurrent} changedFunc={setStartDate} disabled={current==='start' || props.isChanging} value={toValue(startDate)}></DateSelector> <div> - <h2>Adjust Timeframe</h2> <button className="Btn Route-btn" onClick={() => changeTimeframe()} - disabled={current!=="" || props.isChanging}>Change Timeframe</button> + disabled={current!=="" || props.isChanging}>Adjust Timeframe</button> </div> <DateSelector side={"right"} name={"End Date"} className="Coord-select-right" clickedFunc={setCurrent} changedFunc={setEndDate} disabled={current==='end' || props.isChanging} value={toValue(endDate)}></DateSelector> |