Skip to content

Commit abba806

Browse files
[DURACOM-195] replace ul/li with div in navbar
1 parent 1fb742c commit abba806

5 files changed

Lines changed: 14 additions & 15 deletions

File tree

src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<li class="ds-menu-item-wrapper text-md-center" role="presentation"
1+
<div class="ds-menu-item-wrapper text-md-center"
22
[id]="'expandable-navbar-section-' + section.id"
33
(mouseenter)="onMouseEnter($event, isActive)"
44
(mouseleave)="onMouseLeave($event, isActive)"
@@ -24,13 +24,13 @@
2424
</span>
2525
<i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
2626
</a>
27-
<ul @slide *ngIf="isActive" (click)="deactivateSection($event)"
27+
<div @slide *ngIf="isActive" (click)="deactivateSection($event)"
2828
[id]="expandableNavbarSectionId(section.id)"
2929
role="menu"
3030
class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
31-
<li *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
31+
<div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
3232
<ng-container
3333
*ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
34-
</li>
35-
</ul>
36-
</li>
34+
</div>
35+
</div>
36+
</div>

src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
:host {
2-
li.ds-menu-item-wrapper {
2+
.ds-menu-item-wrapper {
33
position: relative; // align dropdown menu with respect to this element
44
}
55

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<li role="presentation"
2-
class="ds-menu-item-wrapper text-md-center"
3-
[id]="'navbar-section-' + section.id">
1+
<div class="ds-menu-item-wrapper text-md-center"
2+
[id]="'navbar-section-' + section.id">
43
<ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
5-
</li>
4+
</div>

src/app/navbar/navbar.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
1010
<ds-themed-user-menu [inExpandableNavbar]="true"></ds-themed-user-menu>
1111
</ng-container>
12-
<ul class="navbar-nav align-items-md-center mr-auto shadow-none gapx-3">
12+
<div class="navbar-nav align-items-md-center mr-auto shadow-none gapx-3">
1313
<ng-container *ngFor="let section of (sections | async)">
1414
<ng-container
1515
*ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
1616
</ng-container>
17-
</ul>
17+
</div>
1818
</div>
1919
</div>
2020
</div>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
22
<ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
33
</ng-container>
4-
<ul class="navbar-nav h-100 align-items-md-stretch gapx-3" role="menubar">
4+
<div class="navbar-nav h-100 align-items-md-stretch gapx-3" role="menubar">
55
<ng-container *ngFor="let section of (sections | async)">
66
<ng-container
77
*ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
88
</ng-container>
9-
</ul>
9+
</div>

0 commit comments

Comments
 (0)