Skip to content

Commit 2eb34ee

Browse files
119915: Fixed bootstrap 5 issues
- Replaced the dropdown icon from DsoEditMetadataEntityFieldComponent from a triangle to an arrow again - Fixed background color of scrollable select fields always being white, was the only field where this was hardcoded - Added missing translate pipes on the aria-label attributes from the selectable dropdowns
1 parent 432b660 commit 2eb34ee

4 files changed

Lines changed: 6 additions & 10 deletions

File tree

src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</ds-dynamic-onebox>
2121
}
2222
@if ((isHierarchicalVocabulary$ | async) || (isScrollableVocabulary$ | async)) {
23-
<button class="btn btn-secondary mt-2"
23+
<button class="btn btn-secondary w-100 mt-2"
2424
[title]="enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing' | translate"
2525
(click)="toggleFreeTextEdition()">
2626
<i class="fas fa-fw" [ngClass]="enabledFreeTextEditing ? 'fa-lock' : 'fa-unlock'"></i>
@@ -31,7 +31,7 @@
3131
<div class="mt-2">
3232
<div class="btn-group w-75">
3333
<i dsAuthorityConfidenceState
34-
class="fas fa-fw p-0 mr-1 mt-auto mb-auto"
34+
class="fas fa-fw p-0 me-1 mt-auto mb-auto"
3535
aria-hidden="true"
3636
[authorityValue]="mdValue.newValue.confidence"
3737
[iconMode]="true"

src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-entity-field/dso-edit-metadata-entity-field.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<select class="form-control" [(ngModel)]="mdValue?.newValue.value" (ngModelChange)="confirm.emit(false)"
1+
<select class="form-select" [(ngModel)]="mdValue?.newValue.value" (ngModelChange)="confirm.emit(false)"
22
[attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate">
33
<option *ngFor="let entity of (entities$ | async)" [value]="entity.label === 'none' ? undefined : entity.label">
44
{{ entity.label }}

src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div #sdRef="ngbDropdown" ngbDropdown display="dynamic" placement="bottom-right" class="w-100">
22
<div class="position-relative right-addon"
33
role="combobox"
4-
[attr.aria-label]="model.label"
4+
[attr.aria-label]="model.label | translate"
55
[attr.aria-owns]="'combobox_' + id + '_listbox'"
66
[attr.aria-expanded]="sdRef.isOpen()"
77
[attr.aria-activedescendant]="(currentValue | async) ? 'combobox_' + id + '_selected' : null">
@@ -29,11 +29,11 @@
2929

3030
<div #dropdownMenu ngbDropdownMenu
3131
class="dropdown-menu scrollable-dropdown-menu w-100"
32-
[attr.aria-label]="model.placeholder">
32+
[attr.aria-label]="model.placeholder | translate">
3333
<div class="scrollable-menu"
3434
role="listbox"
3535
[id]="'combobox_' + id + '_listbox'"
36-
[attr.aria-label]="model.placeholder"
36+
[attr.aria-label]="model.placeholder | translate"
3737
infiniteScroll
3838
[infiniteScrollDistance]="2"
3939
[infiniteScrollThrottle]="50"

src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
padding: 0.70rem 0.70rem 0 0.70rem ;
3030
}
3131

32-
.scrollable-dropdown-input[readonly]{
33-
background-color: #fff;
34-
}
35-
3632
.toggle-icon {
3733
padding: 0.7rem 0.7rem 0 0.7rem;
3834
}

0 commit comments

Comments
 (0)