From 7de91fd2038517d1f8164cf36df2d888b410e0a7 Mon Sep 17 00:00:00 2001 From: Dotty Date: Mon, 16 Dec 2024 14:46:47 -0400 Subject: [PATCH 1/3] [TM-1425] text style dropdown monitored indicator --- .../ResourceTabs/MonitoredTab/components/DataCard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx b/src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx index bb523eaee..c04c483fa 100644 --- a/src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx +++ b/src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx @@ -603,7 +603,7 @@ const DataCard = ({ setSelected(option); }} variant={VARIANT_DROPDOWN_SIMPLE} - inputVariant="text-14-semibold" + inputVariant="text-18-semibold" className="z-50" defaultValue={[DROPDOWN_OPTIONS.find(item => item.slug === indicatorSlug)?.value!]} optionsClassName="w-max z-50" From ed25beded532e6872dc3a5eb425aa6c0d1f41edf Mon Sep 17 00:00:00 2001 From: Dotty Date: Mon, 16 Dec 2024 16:33:19 -0400 Subject: [PATCH 2/3] [TM-1425] text style dropdown monitored indicator --- .../ResourceTabs/MonitoredTab/components/DataCard.tsx | 2 +- src/components/elements/Inputs/Dropdown/DropdownVariant.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx b/src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx index c04c483fa..b4a6a1d9d 100644 --- a/src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx +++ b/src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx @@ -644,7 +644,7 @@ const DataCard = ({ -
+
Date: Tue, 17 Dec 2024 10:57:21 -0400 Subject: [PATCH 3/3] [TM-1425] text style dropdown monitored indicator and text in barChar --- .../MonitoredTab/components/DataCard.tsx | 15 ++++++--------- .../MonitoredTab/components/MonitoredCharts.tsx | 3 ++- .../MonitoredTab/components/TreesLossBarChart.tsx | 2 +- .../elements/Inputs/Dropdown/DropdownVariant.tsx | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx b/src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx index b4a6a1d9d..ae906cd2b 100644 --- a/src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx +++ b/src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx @@ -167,7 +167,7 @@ const TABLE_COLUMNS_HECTARES_STRATEGY: ColumnDef[] = [ enableSorting: false, cell: props => (
- +
), meta: { style: { width: "5%" } } @@ -209,7 +209,7 @@ const TABLE_COLUMNS_HECTARES_ECO_REGION: ColumnDef[] = [ enableSorting: false, cell: props => (
- +
), meta: { style: { width: "5%" } } @@ -251,7 +251,7 @@ const TABLE_COLUMNS_HECTARES_LAND_USE: ColumnDef[] = [ enableSorting: false, cell: props => (
- +
), meta: { style: { width: "5%" } } @@ -549,7 +549,7 @@ const DataCard = ({ enableSorting: false, cell: props => (
- +
), meta: { style: { top: `${topHeaderFirstTable}`, borderRadius: "0" } } @@ -646,7 +646,7 @@ const DataCard = ({
setSelectedPolygonUuid(option[0])} />
- + Indicator Description
diff --git a/src/admin/components/ResourceTabs/MonitoredTab/components/MonitoredCharts.tsx b/src/admin/components/ResourceTabs/MonitoredTab/components/MonitoredCharts.tsx index 7f315ba4c..0a5a1025d 100644 --- a/src/admin/components/ResourceTabs/MonitoredTab/components/MonitoredCharts.tsx +++ b/src/admin/components/ResourceTabs/MonitoredTab/components/MonitoredCharts.tsx @@ -56,6 +56,7 @@ const RestorationMetrics = ({ className="w-full place-content-center pl-8" tooltip={TOTAL_HECTARES_UNDER_RESTORATION_TOOLTIP} showTreesRestoredGraph={false} + classNameBody="!mt-1.5" />
@@ -134,7 +135,7 @@ const MonitoredCharts = ({ case "5": return ( -
+
diff --git a/src/admin/components/ResourceTabs/MonitoredTab/components/TreesLossBarChart.tsx b/src/admin/components/ResourceTabs/MonitoredTab/components/TreesLossBarChart.tsx index 7ca07f205..772cc6150 100644 --- a/src/admin/components/ResourceTabs/MonitoredTab/components/TreesLossBarChart.tsx +++ b/src/admin/components/ResourceTabs/MonitoredTab/components/TreesLossBarChart.tsx @@ -36,7 +36,7 @@ const TreeLossBarChart = ({ data, className = "" }: TreeLossBarChartProps) => { }; return ( -
+

Tree Loss Retrospective (ha)

2015-2024

diff --git a/src/components/elements/Inputs/Dropdown/DropdownVariant.tsx b/src/components/elements/Inputs/Dropdown/DropdownVariant.tsx index e07ed69d0..2f7c8c071 100644 --- a/src/components/elements/Inputs/Dropdown/DropdownVariant.tsx +++ b/src/components/elements/Inputs/Dropdown/DropdownVariant.tsx @@ -53,7 +53,7 @@ export const VARIANT_DROPDOWN_FILTER: DropdownVariant = { }; export const VARIANT_DROPDOWN_SIMPLE: DropdownVariant = { - className: "gap-2 text-black border-b-2 border-black py-0 px-1 rounded-none h-fit !items-baseline !h-8", + className: "gap-2 text-black border-b-2 border-black py-0 px-1 rounded-none h-fit pb-2.5 !h-8", iconClassName: "w-3 h-[9px] fill-trasparent", iconName: IconNames.CHEVRON_DOWN_DASH, iconNameClear: IconNames.CLEAR,