Merge branch 'next' into develop
This commit is contained in:
@@ -61,19 +61,6 @@
|
||||
</table>
|
||||
</digi-table>
|
||||
|
||||
<digi-ng-dialog
|
||||
[afActive]="handelserDialogIsOpen$ | async"
|
||||
(afOnPrimaryClick)="closeHandelser()"
|
||||
(afOnInactive)="closeHandelser()"
|
||||
*ngIf="handelserDialogDeltagare$ | async; let deltagare"
|
||||
[afHeading]="'Händelser för ' + deltagare.fullName"
|
||||
afHeadingLevel="h2"
|
||||
[afPrimaryButtonText]="'Stäng'"
|
||||
id="deltagareHandelser"
|
||||
>
|
||||
<msfa-deltagare-list-handelser-dialog [deltagare]="deltagare"></msfa-deltagare-list-handelser-dialog>
|
||||
</digi-ng-dialog>
|
||||
|
||||
<digi-navigation-pagination
|
||||
*ngIf="totalPage > 1"
|
||||
class="deltagare-list__pagination"
|
||||
@@ -87,3 +74,16 @@
|
||||
>
|
||||
</digi-navigation-pagination>
|
||||
</div>
|
||||
|
||||
<digi-ng-dialog
|
||||
[afActive]="handelserDialogIsOpen$ | async"
|
||||
(afOnPrimaryClick)="closeHandelser()"
|
||||
(afOnInactive)="closeHandelser()"
|
||||
*ngIf="handelserDialogDeltagare$ | async; let deltagare"
|
||||
[afHeading]="'Händelser för ' + deltagare.fullName"
|
||||
afHeadingLevel="h2"
|
||||
[afPrimaryButtonText]="'Stäng'"
|
||||
id="deltagareHandelser"
|
||||
>
|
||||
<msfa-deltagare-list-handelser-dialog [deltagare]="deltagare"></msfa-deltagare-list-handelser-dialog>
|
||||
</digi-ng-dialog>
|
||||
|
||||
@@ -57,6 +57,15 @@ dl {
|
||||
overflow-x: auto;
|
||||
}
|
||||
|
||||
digi-ng-dialog {
|
||||
position: fixed;
|
||||
z-index: $msfa__z-index-backdrop;
|
||||
top: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
}
|
||||
|
||||
.msfa {
|
||||
&__a11y-sr-only {
|
||||
@include msfa__a11y-sr-only;
|
||||
|
||||
Reference in New Issue
Block a user