From 2e910c4a0ab22fa8bd9cfe42105ce10dafe31306 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Wed, 13 Jun 2018 11:11:23 +0200 Subject: [PATCH 1/2] Decrease likelihood of the blue line of price chart toolitp by giving it more padding top and thus increase the likelihood of the toolitp going up and not intersecting with the blue line. The blue line has to be there to cover black x-axix what cannot be changed in chart.js --- src/components/dashboard/currencyGraph.css | 4 +++- src/components/dashboard/currencyGraph.js | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/dashboard/currencyGraph.css b/src/components/dashboard/currencyGraph.css index 0eef4a4694..5dac1a9e20 100644 --- a/src/components/dashboard/currencyGraph.css +++ b/src/components/dashboard/currencyGraph.css @@ -11,7 +11,7 @@ } .chartWrapper { - height: calc(100% - 70px); + height: 100%; min-height: 130px; width: calc(100% + 50px); margin: 0 -25px; @@ -38,6 +38,8 @@ .stepSwitchWrapper { float: right; margin: 50px; + z-index: 10; + position: relative; } .stepSwitch { diff --git a/src/components/dashboard/currencyGraph.js b/src/components/dashboard/currencyGraph.js index b1b0fc4251..9c1360c774 100644 --- a/src/components/dashboard/currencyGraph.js +++ b/src/components/dashboard/currencyGraph.js @@ -44,7 +44,7 @@ const chartOptions = step => ({ padding: { left: 0, right: 0, - top: 0, + top: 80, bottom: bottomPadding, }, }, @@ -174,7 +174,7 @@ class CurrencyGraph extends React.Component { afterDraw(chartInstance) { drawGradientRectangle(chartInstance, { bottomPosition: bottomPadding + 32, - height: 5, + height: 10, }); }, }); From b8d4ea6ff07429a9dad76b6a546b2b3455fe64d5 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Wed, 13 Jun 2018 11:32:26 +0200 Subject: [PATCH 2/2] Update the design of switcher in price chart --- src/components/dashboard/currencyGraph.css | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/components/dashboard/currencyGraph.css b/src/components/dashboard/currencyGraph.css index 5dac1a9e20..6e17b32338 100644 --- a/src/components/dashboard/currencyGraph.css +++ b/src/components/dashboard/currencyGraph.css @@ -1,7 +1,7 @@ @import '../app/variables'; :root { - --stepSwitch-font-size: 15px; + --stepSwitch-font-size: 16px; } .wrapper { @@ -43,17 +43,15 @@ } .stepSwitch { - padding: 10px 16px; + padding: 10px 14px; cursor: pointer; font-size: var(--stepSwitch-font-size); - font-weight: 500; - color: var(--color-grayscale-medium); + font-weight: 600; + font-family: var(--heading-font); + color: var(--color-grayscale-light); &.active { - color: var(--color-white); - background: var(--gradient-tertiary); - border-radius: var(--border-radius-normal); - font-weight: 300; + color: var(--color-grayscale-dark); } }