From 13b6cb30399af3adff6b100cbc8e5be9f5c2c5d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Prod=27homme?= Date: Thu, 24 Oct 2024 17:00:26 +0200 Subject: [PATCH 1/4] refactor(fishing-widget): Change colour of chart --- frontend/src/constants/fishing-protection-chart-colors.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/constants/fishing-protection-chart-colors.ts b/frontend/src/constants/fishing-protection-chart-colors.ts index cf8f6054..fc6cd79e 100644 --- a/frontend/src/constants/fishing-protection-chart-colors.ts +++ b/frontend/src/constants/fishing-protection-chart-colors.ts @@ -1,3 +1,3 @@ export const FISHING_PROTECTION_CHART_COLORS = { - highly: '#2768B4', + highly: '#526EFF', }; From 21b98f3cf9f08cf3d12e0c9b586d416cb016ce6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Prod=27homme?= Date: Thu, 24 Oct 2024 17:19:46 +0200 Subject: [PATCH 2/4] refactor(map): Update styles of popup --- .../content/map/popup/boundaries/index.tsx | 21 +++++++++---------- .../map/content/map/popup/index.tsx | 2 +- frontend/translations/en.json | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/frontend/src/containers/map/content/map/popup/boundaries/index.tsx b/frontend/src/containers/map/content/map/popup/boundaries/index.tsx index 2bc8b0b2..1165b512 100644 --- a/frontend/src/containers/map/content/map/popup/boundaries/index.tsx +++ b/frontend/src/containers/map/content/map/popup/boundaries/index.tsx @@ -203,16 +203,16 @@ const BoundariesPopup: FCWithMessages<{ layerId: number }> = ({ layerId }) => { if (!geometryData) return null; return ( -
-

{localizedLocationName || '-'}

- {isFetching &&
{t('loading')}
} +
+

{localizedLocationName || '-'}

+ {isFetching &&
{t('loading')}
} {!isFetching && !protectionCoverageStats && (
{t('no-data-available')}
)} {!isFetching && !!protectionCoverageStats && ( <> -
-
+
+
{environment === 'marine' ? t('marine-conservation-coverage') : t('terrestrial-conservation-coverage')} @@ -222,18 +222,17 @@ const BoundariesPopup: FCWithMessages<{ layerId: number }> = ({ layerId }) => { t.rich('percentage-bold', { percentage: formattedStats.percentage, b1: (chunks) => ( - {chunks} + {chunks} ), b2: (chunks) => {chunks}, })} {formattedStats.percentage === '-' && ( - - {formattedStats.percentage} - + {formattedStats.percentage} )}
- {t('protected-area', { + {t.rich('protected-area', { + br: () =>
, protectedArea: formattedStats.protectedArea, totalArea: formatKM( locale, @@ -248,7 +247,7 @@ const BoundariesPopup: FCWithMessages<{ layerId: number }> = ({ layerId }) => {