From b3868e2a7e6af7b8c7965f844d3e4543b46e6391 Mon Sep 17 00:00:00 2001
From: remip <rpapin@grandlyon.com>
Date: Wed, 21 Oct 2020 11:09:43 +0200
Subject: [PATCH] MR fix
---
.gitignore | 2 ++
src/components/DateNavigator/datenavigator.scss | 3 +++
src/components/Report/ChartReport.tsx | 2 +-
src/components/Report/MonthlyReport.tsx | 2 +-
src/components/Report/chartreport.scss | 1 +
src/styles/components/_indicators.scss | 7 +++++++
6 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 312d3d562..be64af424 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@ node_modules/
npm-debug.log
yarn-error.log
+#Report
+public/report.html
# Build
build/
diff --git a/src/components/DateNavigator/datenavigator.scss b/src/components/DateNavigator/datenavigator.scss
index af45b9478..769c3bdeb 100644
--- a/src/components/DateNavigator/datenavigator.scss
+++ b/src/components/DateNavigator/datenavigator.scss
@@ -14,5 +14,8 @@
&.disable {
opacity: 0.3,
}
+ &.disable:hover {
+ cursor: default;
+ }
}
}
\ No newline at end of file
diff --git a/src/components/Report/ChartReport.tsx b/src/components/Report/ChartReport.tsx
index 856c7811e..8c9063eb0 100644
--- a/src/components/Report/ChartReport.tsx
+++ b/src/components/Report/ChartReport.tsx
@@ -98,7 +98,7 @@ const ChartReport: React.FC<ChartReportProps> = ({
</g>
<g transform={`translate(0,${marginTop})`}>
<g
- transform={`translate(${0.2 * width - 35}, ${height -
+ transform={`translate(${xScale('0')}, ${height -
marginTop -
marginBottom * 2})`}
>
diff --git a/src/components/Report/MonthlyReport.tsx b/src/components/Report/MonthlyReport.tsx
index 46c176a9f..21ffa12b1 100644
--- a/src/components/Report/MonthlyReport.tsx
+++ b/src/components/Report/MonthlyReport.tsx
@@ -113,7 +113,7 @@ const MonthlyReport: React.FC = () => {
indexDisplayed={0}
offset={{ month: -1 }}
/>
- <div>
+ <div className="flex-center">
<div className="report-header text-16-normal-uppercase">
{t('report.reportDate')}{' '}
{convertDateToMonthString(reportDate.plus({ month: -1 }))}
diff --git a/src/components/Report/chartreport.scss b/src/components/Report/chartreport.scss
index e51e71783..e44d6484f 100644
--- a/src/components/Report/chartreport.scss
+++ b/src/components/Report/chartreport.scss
@@ -4,4 +4,5 @@
.chart-root {
margin-bottom: 1rem;
+ max-width: 400px;
}
\ No newline at end of file
diff --git a/src/styles/components/_indicators.scss b/src/styles/components/_indicators.scss
index 26c1dc9ba..d824b6301 100644
--- a/src/styles/components/_indicators.scss
+++ b/src/styles/components/_indicators.scss
@@ -76,6 +76,7 @@
.fpi-content {
display: flex;
flex-direction: row;
+ justify-content: center;
&:first-child() {
margin-bottom: 0.75rem;
}
@@ -157,3 +158,9 @@
align-self: center;
}
}
+.flex-center {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+}
--
GitLab