Skip to content

Commit

Permalink
Merge branch 'refs/heads/w2p-110615_minor-accessibibity-fixes_contrib…
Browse files Browse the repository at this point in the history
…ute-7.2' into w2p-110615_minor-accessibibity-fixes_contribute-7.6

# Conflicts:
#	src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
  • Loading branch information
alexandrevryghem committed Aug 13, 2024
2 parents 404ccd9 + a0515c4 commit 655813a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<ng-container *ngIf="relationTypes.length > 1">
<ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs">
<li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter">
<a ngbNavLink>{{'item.page.relationships.' + relationType.label | translate}}</a>
<ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs" role="tablist">
<li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter" role="presentation">
<a ngbNavLink role="tab">
{{'item.page.relationships.' + relationType.label | translate}}
</a>
<ng-template ngbNavContent>
<div class="mt-4">
<ds-related-entities-search [item]="item"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
(mouseleave)="deactivateSection($event)">
<a href="javascript:void(0);" class="nav-link dropdown-toggle" routerLinkActive="active"
[class.disabled]="section.model?.disabled"
id="browseDropdown" (click)="toggleSection($event)"
(click)="toggleSection($event)"
data-toggle="dropdown">
<ng-container
*ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
Expand Down

0 comments on commit 655813a

Please sign in to comment.