diff --git a/src/components/ContainerComponents/Header/Header.tsx b/src/components/ContainerComponents/Header/Header.tsx index e0d487f600c86ebdecc9bf87be06f7f6f2abc11f..d5b20f5afbfbaae61aa4d80104a2b6170990579b 100644 --- a/src/components/ContainerComponents/Header/Header.tsx +++ b/src/components/ContainerComponents/Header/Header.tsx @@ -54,12 +54,10 @@ const Header: React.FC<HeaderProps> = ({ <div className="header-top"> <div className="header-content"> {textKey && ( - <div className="header-text text-14-normal-uppercase"> - {t(textKey)} - </div> + <div className="header-text text-22-bold">{t(textKey)}</div> )} {desktopTitleKey && ( - <div className="header-text-desktop text-22-normal"> + <div className="header-text-desktop text-22-bold"> {displayBackArrow && ( <StyledIconButton className="cv-button" diff --git a/src/components/ContainerComponents/ViewContainer/SingleFluidViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/SingleFluidViewContainer.tsx index b66142e655216a15cd49bf5d732e40a985a5c1b8..3afebee24e7538ca933d33ded9468c33d649869f 100644 --- a/src/components/ContainerComponents/ViewContainer/SingleFluidViewContainer.tsx +++ b/src/components/ContainerComponents/ViewContainer/SingleFluidViewContainer.tsx @@ -1,4 +1,4 @@ -import React, { useState } from 'react' +import React, { useState, useEffect } from 'react' import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner' import CozyBar from 'components/ContainerComponents/CozyBar/CozyBar' import Header from 'components/ContainerComponents/Header/Header' @@ -43,6 +43,9 @@ const SingleFluidViewContainer: React.FC<SingleFluidViewContainerProps> = ({ const defineHeaderHeight = (height: number) => { setHeaderHeight(height) } + useEffect(() => { + console.log('chart', isChartLoading, 'in', isIndicatorsLoading) + }, [isChartLoading, isIndicatorsLoading]) return ( <> @@ -70,9 +73,7 @@ const SingleFluidViewContainer: React.FC<SingleFluidViewContainerProps> = ({ )} <div className={`${ - isChartLoading || isIndicatorsLoading - ? 'chart-indicator-none' - : 'chart-indicator-display' + isChartLoading ? 'chart-indicator-none' : 'chart-indicator-display' }`} > <FluidChartContainer diff --git a/src/components/ContentComponents/Charts/Bar.tsx b/src/components/ContentComponents/Charts/Bar.tsx index 0b2460a3fd8a10da39a14ff0473d16717787846f..8342a11b72b479c58c900b500afe61515df220cd 100644 --- a/src/components/ContentComponents/Charts/Bar.tsx +++ b/src/components/ContentComponents/Charts/Bar.tsx @@ -150,6 +150,7 @@ const Bar = (props: BarProps) => { )}, -40)`} > <rect + onClick={handleClick} x="0" y="0" width={showCompare ? getBandWidth() * 2 : getBandWidth()} diff --git a/src/locales/fr.json b/src/locales/fr.json index b8375f0d90585e76ddd56e7ddc7a88327f59cbda..bd69f91c2bca2c623655a34776859e0d0cac7ace 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -84,7 +84,7 @@ }, "MONTH": { "STEP": "Par mois", - "COMPARELABEL": "Comparer au mois précédent" + "COMPARELABEL": "Comparer à l'année précédente" }, "DAY": { "STEP": "Par jour", diff --git a/src/styles/components/_barchart.scss b/src/styles/components/_barchart.scss index 6f575e0fcb188490057b7a218e203db6b671f322..ec868620933fdda66176076c47e21a01cd9ab0ec 100644 --- a/src/styles/components/_barchart.scss +++ b/src/styles/components/_barchart.scss @@ -11,10 +11,12 @@ } } .background-true { - display: inline; + // display: inline; + opacity: 1; } .background-false { - display: none; + // display: none; + opacity: 0; } .bar-ELECTRICITY { fill: $elec-off-color;