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

Jump to bottom

Multiline selected facet badge on search page #2675

Merged
merged 6 commits into from
Apr 29, 2024
Merged

Multiline selected facet badge on search page #2675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f4dc8ca
108595: fix for overflowing search filter badge selection
LotteHofstede Nov 28, 2023
40c13e6
Merge remote-tracking branch 'origin/main' into multiline-search-filt…
LotteHofstede Nov 30, 2023
a026c65
Removed unnecessary change
LotteHofstede Nov 30, 2023
b11fa60
Merge branch 'w2p-108595_multiline-search-filter-badge' into multilin…
LotteHofstede Nov 30, 2023
a63a69d
Merge remote-tracking branch 'origin/main' into multiline-search-filt…
LotteHofstede Mar 4, 2024
5859fc1
Merge remote-tracking branch 'origin/main' into multiline-search-filt…
LotteHofstede Apr 16, 2024
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
8 changes: 5 additions & 3 deletions src/app/shared/search/search-labels/search-label/search-label.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<a class="badge badge-primary mr-1 mb-1"
<a class="badge badge-primary mb-1"
[attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.' + key) | translate, value: normalizeFilterValue(value) }"
[routerLink]="searchLink"
[queryParams]="(removeParameters | async)" queryParamsHandling="merge">
{{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }}
<span aria-hidden="true"> ×</span>
<span class="d-flex">
<span class="flex-grow-1 text-left">{{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }}</span>
<span class="pl-1" aria-hidden="true">×</span>
</span>
</a>
3 changes: 3 additions & 0 deletions src/app/shared/search/search-labels/search-label/search-label.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.badge {
white-space: inherit;
}
1 change: 1 addition & 0 deletions src/app/shared/search/search-labels/search-label/search-label.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { stripOperatorFromFilterValue } from '../../search.utils';
@Component({
selector: 'ds-search-label',
templateUrl: './search-label.component.html',
styleUrls: ['./search-label.component.scss'],
standalone: true,
imports: [RouterLink, AsyncPipe, TranslateModule],
})
Expand Down
9 changes: 8 additions & 1 deletion src/app/shared/search/search-labels/search-labels.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
:host {
line-height: 1;
}
.labels {
margin: 0 calc(-1 * var(--bs-spacer)/8);
ds-search-label {
display: inline-block;
padding: 0 calc(var(--bs-spacer)/8);
}
}
}
4 changes: 2 additions & 2 deletions src/app/shared/search/search.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
[inPlaceSearch]="inPlaceSearch"
[searchPlaceholder]="searchFormPlaceholder | translate">
</ds-themed-search-form>
<div class="row mb-3 mb-md-1">
<div class="labels col-sm-9">
<div class="mb-3 mb-md-1">
<div class="labels">
<ds-search-labels [inPlaceSearch]="inPlaceSearch"></ds-search-labels>
</div>
</div>
Expand Down
Loading