From f5b54383a7e43852cfa7203275c516b415ab9836 Mon Sep 17 00:00:00 2001 From: Alejandro Sanchez Date: Thu, 16 Jan 2025 09:08:57 -0800 Subject: [PATCH 1/2] PSP-9803 UI UX: Advanced Filter Map - Reset to Default Button icon (#4596) --- .../AdvancedFilter/FilterContentForm.tsx | 10 +++++--- .../FilterContentForm.test.tsx.snap | 23 ++++++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/FilterContentForm.tsx b/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/FilterContentForm.tsx index 5064186db1..720c0bb775 100644 --- a/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/FilterContentForm.tsx +++ b/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/FilterContentForm.tsx @@ -100,8 +100,7 @@ export const FilterContentForm: React.FC - - Reset to Default + Reset to Default
@@ -270,8 +269,13 @@ const StyledResetContainer = styled.div` const StyledResetButton = styled(ResetButton)` &&.btn { + letter-spacing: unset; &.btn-info { - color: ${({ theme }) => theme.bcTokens.surfaceColorPrimaryButtonDefault}; + .Button__value { + font-size: 1.7rem; + font-weight: 400; + line-height: 1.5; + } } } `; diff --git a/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/__snapshots__/FilterContentForm.test.tsx.snap b/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/__snapshots__/FilterContentForm.test.tsx.snap index 8dfaca5427..9666501ba5 100644 --- a/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/__snapshots__/FilterContentForm.test.tsx.snap +++ b/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/__snapshots__/FilterContentForm.test.tsx.snap @@ -275,8 +275,17 @@ exports[`FilterContentForm component > renders as expected 1`] = ` background-color: #f2f2f2; } -.c2.c2.btn.btn-info { - color: #013366; +.c2.c2.btn { + -webkit-letter-spacing: unset; + -moz-letter-spacing: unset; + -ms-letter-spacing: unset; + letter-spacing: unset; +} + +.c2.c2.btn.btn-info .Button__value { + font-size: 1.7rem; + font-weight: 400; + line-height: 1.5; }
renders as expected 1`] = ` class="c0" > - - Reset to Default -
Date: Thu, 16 Jan 2025 17:09:22 +0000 Subject: [PATCH 2/2] CI: Bump version to v5.8.0-97.25 --- source/backend/api/Pims.Api.csproj | 2 +- source/frontend/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj index d8fa9ae899..3e561d77e6 100644 --- a/source/backend/api/Pims.Api.csproj +++ b/source/backend/api/Pims.Api.csproj @@ -2,7 +2,7 @@ 0ef6255f-9ea0-49ec-8c65-c172304b4926 - 5.8.0-97.24 + 5.8.0-97.25 5.8.0.97 true {16BC0468-78F6-4C91-87DA-7403C919E646} diff --git a/source/frontend/package.json b/source/frontend/package.json index 4d9577d96e..c0065f584e 100644 --- a/source/frontend/package.json +++ b/source/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "5.8.0-97.24", + "version": "5.8.0-97.25", "private": true, "dependencies": { "@bcgov/bc-sans": "1.0.1",