Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PSP-9803 UI UX: Advanced Filter Map - Reset to Default Button icon #4596

Merged
merged 4 commits into from
Jan 16, 2025
Merged

PSP-9803 UI UX: Advanced Filter Map - Reset to Default Button icon #4596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcc0f8a
Style changes for consistency with search bar reset button
asanchezr Jan 14, 2025
f34c346
Update snapshots
asanchezr Jan 14, 2025
752d666
Style updates based on feedback from Ana
asanchezr Jan 15, 2025
533345b
Update snapshots
asanchezr Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/FilterContentForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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;
}
}
}
`;
23 changes: 17 additions & 6 deletions ...ponents/maps/leaflet/Control/AdvancedFilter/__snapshots__/FilterContentForm.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -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"
Expand Down
Loading