Skip to content

Commit 8682866

Browse files
kofzerabodnara
kofzera
authored and
bodnara
committed
fix(admin): missaligned icons in action-buttons
* Fix action-buttons where the icon inside was misaligned * Buttons in the group application form changed to be consistent with VO * Settings button in VO application form aligned to be consistent with group
1 parent aa73beb commit 8682866

File tree

4 files changed

+40
-30
lines changed

4 files changed

+40
-30
lines changed

‎apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-application-form/group-settings-application-form.component.html‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ <h1 class="page-subtitle">
3131
{{applicationForm.automaticApprovalEmbedded ?
3232
('GROUP_DETAIL.SETTINGS.APPLICATION_FORM.AUTOMATIC'| translate) : ('GROUP_DETAIL.SETTINGS.APPLICATION_FORM.MANUAL'| translate)}}
3333
</span>
34-
<button *ngIf="editAuth" (click)="settings()" mat-stroked-button>
35-
<i class="material-icons">edit</i>
36-
{{'GROUP_DETAIL.SETTINGS.APPLICATION_FORM.SETTINGS_BUTTON' | translate}}
34+
<button *ngIf="editAuth" (click)="settings()" class="ms-2 action-button" mat-stroked-button>
35+
<i class="material-icons align-middle">edit</i>
36+
<span class="align-middle">
37+
{{'GROUP_DETAIL.SETTINGS.APPLICATION_FORM.SETTINGS_BUTTON' | translate}}
38+
</span>
3739
</button>
3840
</div>
3941
<span *ngIf="autoRegistrationEnabled">
@@ -71,9 +73,11 @@ <h1 class="page-subtitle">
7173
{{'VO_DETAIL.SETTINGS.APPLICATION_FORM.SAVE_BUTTON' | translate}}
7274
</button>
7375

74-
<button (click)="copy()" *ngIf="editAuth" class="me-2" mat-stroked-button>
75-
<i class="material-icons">file_copy</i>
76-
{{'GROUP_DETAIL.SETTINGS.APPLICATION_FORM.COPY_GROUP_BUTTON' | translate}}
76+
<button (click)="copy()" *ngIf="editAuth" class="me-2 action-button" mat-stroked-button>
77+
<i class="material-icons align-middle">file_copy</i>
78+
<span class="align-middle">
79+
{{'GROUP_DETAIL.SETTINGS.APPLICATION_FORM.COPY_GROUP_BUTTON' | translate}}
80+
</span>
7781
</button>
7882

7983
<button (click)="preview()" mat-stroked-button>

‎apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-notifications/group-settings-notifications.component.html‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,17 @@ <h1 class="page-subtitle">
2424
</button>
2525

2626
<button (click)="changeEmailFooter()" class="me-2 action-button" mat-stroked-button>
27-
<i class="material-icons">email</i>
28-
{{'GROUP_DETAIL.SETTINGS.NOTIFICATIONS.EMAIL_FOOTER' | translate}}
27+
<i class="material-icons align-middle">email</i>
28+
<span class="align-middle">
29+
{{'GROUP_DETAIL.SETTINGS.NOTIFICATIONS.EMAIL_FOOTER' | translate}}
30+
</span>
2931
</button>
3032

3133
<button (click)="copy()" *ngIf="copyAuth" class="action-button" mat-stroked-button>
32-
<i class="material-icons">file_copy</i>
33-
{{'GROUP_DETAIL.SETTINGS.NOTIFICATIONS.COPY_FROM_VO' | translate}}
34+
<i class="material-icons align-middle">file_copy</i>
35+
<span class="align-middle">
36+
{{'GROUP_DETAIL.SETTINGS.NOTIFICATIONS.COPY_FROM_VO' | translate}}
37+
</span>
3438
</button>
3539
</div>
3640

‎apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-application-form/vo-settings-application-form.component.html‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ <h1 class="page-subtitle">
33
</h1>
44
<mat-spinner *ngIf="loading" class="ms-auto me-auto"> </mat-spinner>
55
<div>
6-
<div *ngIf="!loading" class="d-flex w-50">
7-
<div class="w-50">
6+
<div *ngIf="!loading" class="d-flex w-75">
7+
<div>
88
<div class="fw-bold">
99
{{'VO_DETAIL.SETTINGS.APPLICATION_FORM.MODULE_NAME' | translate}}:
1010
{{applicationForm.moduleClassName}}
@@ -15,26 +15,22 @@ <h1 class="page-subtitle">
1515
>{{'VO_DETAIL.SETTINGS.APPLICATION_FORM.APPLICATION_TYPE' | translate}}</span
1616
>:
1717

18-
<mat-icon class="align-bottom" matTooltip="Initial">arrow_right_alt</mat-icon>
18+
<mat-icon class="align-middle" matTooltip="Initial">arrow_right_alt</mat-icon>
1919
{{applicationForm.automaticApproval ?
2020
('VO_DETAIL.SETTINGS.APPLICATION_FORM.AUTOMATIC'| translate) : ('VO_DETAIL.SETTINGS.APPLICATION_FORM.MANUAL'| translate)}}
2121
,
2222

23-
<mat-icon class="align-bottom" matTooltip="Extension">restore</mat-icon>
23+
<mat-icon class="align-middle" matTooltip="Extension">restore</mat-icon>
2424
{{applicationForm.automaticApprovalExtension ?
2525
('VO_DETAIL.SETTINGS.APPLICATION_FORM.AUTOMATIC'| translate) : ('VO_DETAIL.SETTINGS.APPLICATION_FORM.MANUAL'| translate)}}
26+
<button *ngIf="editAuth" (click)="settings()" class="ms-3 action-button" mat-stroked-button>
27+
<i class="material-icons align-middle">edit</i>
28+
<span class="align-middle">
29+
{{'VO_DETAIL.SETTINGS.APPLICATION_FORM.SETTINGS_BUTTON' | translate}}
30+
</span>
31+
</button>
2632
</div>
2733
</div>
28-
<div class="w-25">
29-
<button
30-
*ngIf="editAuth"
31-
(click)="settings()"
32-
class="ms-auto action-button"
33-
mat-stroked-button>
34-
<i class="material-icons">edit</i>
35-
{{'VO_DETAIL.SETTINGS.APPLICATION_FORM.SETTINGS_BUTTON' | translate}}
36-
</button>
37-
</div>
3834
</div>
3935

4036
<mat-divider class="mb-2 mt-2"></mat-divider>
@@ -66,8 +62,10 @@ <h1 class="page-subtitle">
6662
</button>
6763

6864
<button (click)="copy()" *ngIf="editAuth" class="me-2 action-button" mat-stroked-button>
69-
<i class="material-icons">file_copy</i>
70-
{{'VO_DETAIL.SETTINGS.APPLICATION_FORM.COPY_VO_BUTTON' | translate}}
65+
<i class="material-icons align-middle">file_copy</i>
66+
<span class="align-middle">
67+
{{'VO_DETAIL.SETTINGS.APPLICATION_FORM.COPY_VO_BUTTON' | translate}}
68+
</span>
7169
</button>
7270

7371
<button (click)="preview()" mat-stroked-button>

‎apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-notifications/vo-settings-notifications.component.html‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,17 @@ <h1 class="page-subtitle">
1919
</button>
2020

2121
<button (click)="changeEmailFooter()" class="me-2 action-button" mat-stroked-button>
22-
<i class="material-icons">email</i>
23-
{{'VO_DETAIL.SETTINGS.NOTIFICATIONS.EMAIL_FOOTER' | translate}}
22+
<i class="material-icons align-middle">email</i>
23+
<span class="align-middle">
24+
{{'VO_DETAIL.SETTINGS.NOTIFICATIONS.EMAIL_FOOTER' | translate}}
25+
</span>
2426
</button>
2527

2628
<button (click)="copy()" *ngIf="copyAuth" class="action-button" mat-stroked-button>
27-
<i class="material-icons">file_copy</i>
28-
{{'VO_DETAIL.SETTINGS.NOTIFICATIONS.COPY_FROM_VO' | translate}}
29+
<i class="material-icons align-middle">file_copy</i>
30+
<span class="align-middle">
31+
{{'VO_DETAIL.SETTINGS.NOTIFICATIONS.COPY_FROM_VO' | translate}}
32+
</span>
2933
</button>
3034
</div>
3135

0 commit comments

Comments
 (0)