Merge branch 'dev' into psp-9774-uiux

bcgov · Jan 16, 2025 · 43975f3 · 43975f3
2 parents aa294a9 + 605c4ab
commit 43975f3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
-    <Version>5.8.0-97.24</Version>
+    <Version>5.8.0-97.25</Version>
     <AssemblyVersion>5.8.0.97</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>{16BC0468-78F6-4C91-87DA-7403C919E646}</ProjectGuid>

diff --git 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",

diff --git 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<React.PropsWithChildren<IFilterContentF
         <FormObserver onChange={onChange} />
         <LoadingBackdrop show={isLoading} parentScreen />
         <StyledResetContainer>
-          <StyledResetButton onClick={onReset} />
-          <span>Reset to Default</span>
+          <StyledResetButton onClick={onReset}>Reset to Default</StyledResetButton>
         </StyledResetContainer>
         <Section header="Show Ownership" isCollapsable initiallyExpanded>
           <SectionField label={null} contentWidth="12">
@@ -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/...ponents/maps/leaflet/Control/AdvancedFilter/__snapshots__/FilterContentForm.test.tsx.snap b/...ponents/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;
 }
 
 <form
@@ -286,7 +295,7 @@ exports[`FilterContentForm component > renders as expected 1`] = `
       class="c0"
     >
       <button
-        class="c1 Button Button--icon-only c2 btn btn-info"
+        class="c1 Button c2 btn btn-info"
         data-testid="reset-button"
         id="reset-button"
         title="reset-button"
@@ -309,10 +318,12 @@ exports[`FilterContentForm component > renders as expected 1`] = `
             />
           </svg>
         </div>
+        <div
+          class="Button__value"
+        >
+          Reset to Default
+        </div>
       </button>
-      <span>
-        Reset to Default
-      </span>
     </div>
     <div
       class="c3 form-section"