Skip to content

Commit f86c1a1

Browse files
KasinhouMatus Kasak
andauthored
VSB-TUO/Fix duplicate id search-navbar-container and loginDropdownMenu (#1245)
Co-authored-by: Matus Kasak <matus.kasak@dataquest.sk>
1 parent 5be6af6 commit f86c1a1

7 files changed

Lines changed: 10 additions & 12 deletions

File tree

src/app/search-navbar/search-navbar.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
1+
<div class="search-navbar-container" [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
22
<div class="d-inline-block position-relative">
33
<form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on" class="d-flex">
44
<input #searchInput [@toggleAnimation]="isExpanded" [attr.aria-label]="('nav.search' | translate)" name="query"

src/app/shared/auth-nav-menu/auth-nav-menu.component.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
role="button"
1010
tabindex="0"
1111
aria-haspopup="menu"
12-
aria-controls="loginDropdownMenu"
1312
[attr.aria-expanded]="loginDrop.isOpen()"
1413
ngbDropdownToggle>
1514
{{ 'nav.login' | translate }}
1615
</button>
17-
<div id="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
16+
<div class="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
1817
role="dialog"
1918
aria-modal="true"
2019
[attr.aria-label]="'nav.login' | translate">
@@ -35,7 +34,7 @@
3534
[attr.data-test]="'user-menu' | dsBrowserOnly"
3635
ngbDropdownToggle>
3736
<i class="fas fa-user-circle fa-lg fa-fw"></i></button>
38-
<div id="logoutDropdownMenu" ngbDropdownMenu>
37+
<div class="logoutDropdownMenu" ngbDropdownMenu>
3938
<ds-user-menu [inExpandableNavbar]="false"></ds-user-menu>
4039
</div>
4140
</div>

src/app/shared/auth-nav-menu/auth-nav-menu.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#loginDropdownMenu, #logoutDropdownMenu {
1+
.loginDropdownMenu, .logoutDropdownMenu {
22
min-width: 330px;
33
z-index: 1002;
44
}
55

6-
#loginDropdownMenu {
6+
.loginDropdownMenu {
77
min-height: 75px;
88
}
99

src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ describe('AuthNavMenuComponent', () => {
214214
});
215215

216216
it('should render login dropdown menu', () => {
217-
const loginDropdownMenu = deNavMenuItem.query(By.css('div#loginDropdownMenu'));
217+
const loginDropdownMenu = deNavMenuItem.query(By.css('div.loginDropdownMenu'));
218218
expect(loginDropdownMenu.nativeElement).toBeDefined();
219219
});
220220
});

src/themes/custom/app/search-navbar/search-navbar.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div id="search-navbar-container" [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
1+
<div class="search-navbar-container" [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
22
<div class="d-inline-block position-relative">
33
<form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on" class="d-flex">
44
<input #searchInput [@toggleAnimation]="isExpanded" [attr.aria-label]="('nav.search' | translate)" name="query"

src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
role="button"
1010
tabindex="0"
1111
aria-haspopup="menu"
12-
aria-controls="loginDropdownMenu"
1312
[attr.aria-expanded]="loginDrop.isOpen()"
1413
ngbDropdownToggle>
1514
{{ 'nav.login' | translate }}
1615
</button>
17-
<div id="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
16+
<div class="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
1817
role="dialog"
1918
aria-modal="true"
2019
[attr.aria-label]="'nav.login' | translate">
@@ -35,7 +34,7 @@
3534
[attr.data-test]="'user-menu' | dsBrowserOnly"
3635
ngbDropdownToggle>
3736
<i class="fas fa-user-circle fa-lg fa-fw"></i></button>
38-
<div id="logoutDropdownMenu" ngbDropdownMenu>
37+
<div class="logoutDropdownMenu" ngbDropdownMenu>
3938
<ds-themed-user-menu [inExpandableNavbar]="false"></ds-themed-user-menu>
4039
</div>
4140
</div>

src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#loginDropdownMenu, #logoutDropdownMenu {
1+
.loginDropdownMenu, .logoutDropdownMenu {
22
min-width: 330px;
33
z-index: 1002;
44
}

0 commit comments

Comments
 (0)