Skip to content

Commit 13dbd6b

Browse files
authored
Merge pull request DSpace#2675 from atmire/multiline-search-filter-badge_main
Multiline selected facet badge on search page
2 parents 99bfe13 + 5859fc1 commit 13dbd6b

5 files changed

Lines changed: 19 additions & 6 deletions

File tree

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
<a class="badge badge-primary mr-1 mb-1"
1+
<a class="badge badge-primary mb-1"
22
[attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.' + key) | translate, value: normalizeFilterValue(value) }"
33
[routerLink]="searchLink"
44
[queryParams]="(removeParameters | async)" queryParamsHandling="merge">
5-
{{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }}
6-
<span aria-hidden="true"> ×</span>
5+
<span class="d-flex">
6+
<span class="flex-grow-1 text-left">{{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }}</span>
7+
<span class="pl-1" aria-hidden="true">×</span>
8+
</span>
79
</a>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.badge {
2+
white-space: inherit;
3+
}

src/app/shared/search/search-labels/search-label/search-label.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import { stripOperatorFromFilterValue } from '../../search.utils';
2626
@Component({
2727
selector: 'ds-search-label',
2828
templateUrl: './search-label.component.html',
29+
styleUrls: ['./search-label.component.scss'],
2930
standalone: true,
3031
imports: [RouterLink, AsyncPipe, TranslateModule],
3132
})
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
:host {
22
line-height: 1;
3-
}
3+
.labels {
4+
margin: 0 calc(-1 * var(--bs-spacer)/8);
5+
ds-search-label {
6+
display: inline-block;
7+
padding: 0 calc(var(--bs-spacer)/8);
8+
}
9+
}
10+
}

src/app/shared/search/search.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
[inPlaceSearch]="inPlaceSearch"
9797
[searchPlaceholder]="searchFormPlaceholder | translate">
9898
</ds-themed-search-form>
99-
<div class="row mb-3 mb-md-1">
100-
<div class="labels col-sm-9">
99+
<div class="mb-3 mb-md-1">
100+
<div class="labels">
101101
<ds-search-labels [inPlaceSearch]="inPlaceSearch"></ds-search-labels>
102102
</div>
103103
</div>

0 commit comments

Comments
 (0)