Skip to content

Commit b527c9b

Browse files
shawonshawon
authored andcommitted
added new button design
1 parent 121792b commit b527c9b

File tree

37 files changed

+137
-139
lines changed

37 files changed

+137
-139
lines changed

eform-client/src/app/common/modules/eform-shared-tags/components/shared-tag-create/shared-tag-create.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ <h3 mat-dialog-title>{{ 'New tag' | translate }}</h3>
1111
<mat-label>{{ 'Name' | translate }}</mat-label>
1212
</mat-form-field>
1313
</div>
14-
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
14+
<div mat-dialog-actions class="d-flex flex-row justify-content-end align-items-center gap-12">
1515
<button
16-
class="btn-primary"
16+
class="btn-primary btn-primary--icon-left"
1717
color="accent"
1818
id="newTagSaveBtn"
1919
[disabled]="!name"

eform-client/src/app/common/modules/eform-shared/components/entity-item-edit-name/entity-item-edit-name.component.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@ <h3 mat-dialog-title>{{ 'Edit element' | translate}}</h3>
99
id="entityItemEditNameBox">
1010
</mat-form-field>
1111
</div>
12-
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
12+
<div mat-dialog-actions class="d-flex flex-row justify-content-end align-items-center gap-12">
1313
<button
14-
mat-raised-button
15-
color="accent"
14+
class="btn-primary btn-primary--icon-left"
1615
(click)="emitValue();"
1716
id="entityItemSaveBtn"
1817
>
1918
{{'Save' | translate}}
2019
</button>
2120
<button
22-
mat-raised-button
21+
class="btn-cancel"
2322
id="entityItemCancelBtn"
2423
(click)="hide()"
2524
>

eform-client/src/app/modules/account-management/components/profile/change-password/change-password.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<eform-new-subheader>
22
<button
3-
mat-raised-button
4-
color="accent"
3+
class="btn-primary btn-primary--icon-left"
54
id="changePasswordSaveBtn"
65
[disabled]="!valid"
76
(click)="updateUserPassword()"

eform-client/src/app/modules/account-management/components/profile/profile-settings/profile-settings.component.html

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<eform-new-subheader>
22
<div>
33
<button
4-
mat-raised-button
5-
color="accent"
4+
class="btn-primary btn-primary--icon-left"
65
matTooltip="Save settings"
76
id="ProfileSettingsSaveBtn"
87
(click)="updateUserProfileSettings()">
@@ -75,17 +74,16 @@
7574
<div class="d-flex pt-2">
7675
<div class="align-self-center align-self-end mb-3">
7776
<button
78-
mat-raised-button
79-
color="primary"
77+
class="btn-primary btn-primary--icon-left"
8078
*ngIf="profilePictureUploader?.queue?.length === 0"
8179
id="loginPageImageUploadBtn"
8280
(click)="loginPagefileInput.click()"
8381
>
84-
{{ 'Upload' | translate }}
82+
<mat-icon>upload</mat-icon>
83+
<span>{{ 'Upload' | translate }}</span>
8584
</button>
8685
<button
87-
mat-raised-button
88-
color="warn"
86+
class="btn-warning"
8987
*ngIf="profilePictureUploader?.queue?.length > 0"
9088
(click)="loginPagefileInput.click()"
9189
>
@@ -102,8 +100,7 @@
102100
</div>
103101
<div class="align-self-center align-self-end mb-3 pl-2">
104102
<button
105-
mat-raised-button
106-
color="accent"
103+
class="btn-cancel"
107104
id="resetProfilePicture"
108105
(click)="resetProfilePicture()"
109106
matTooltip="{{ 'Reset' | translate }}"

eform-client/src/app/modules/account-management/components/users/user-modal/user-modal.component.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,9 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit User' : 'New User') | translate }}</h3>
8282
</div>
8383
</form>
8484
</div>
85-
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
85+
<div mat-dialog-actions class="d-flex flex-row justify-content-end align-items-center gap-12">
8686
<button
87-
mat-raised-button
88-
color="accent"
87+
class="btn-primary btn-primary--icon-left"
8988
type="submit"
9089
[disabled]="userForm.invalid"
9190
(click)="submit()"
@@ -94,7 +93,7 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit User' : 'New User') | translate }}</h3>
9493
{{ (edit ? 'Save' : 'Create') | translate }}
9594
</button>
9695
<button
97-
mat-raised-button
96+
class="btn-cancel"
9897
(click)="hide()"
9998
type="button"
10099
[id]="edit ? 'editUserCancelSaveBtn' : 'createAdministrationUserCancelBtn'"

eform-client/src/app/modules/account-management/components/users/user-set-password-modal/user-set-password.component.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,17 @@ <h3 mat-dialog-title>{{ 'Set user password' | translate }}</h3>
8888
</mat-form-field>
8989
</form>
9090
</div>
91-
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
91+
<div mat-dialog-actions class="d-flex flex-row justify-content-end align-items-center gap-12">
9292
<button
93-
mat-raised-button
94-
color="warn"
93+
class="btn-warning"
9594
id="userDeleteBtn"
9695
(click)="setPassword()"
9796
[disabled]="setPasswordForm.invalid"
9897
>
9998
{{ 'Save' | translate }}
10099
</button>
101100
<button
102-
mat-raised-button
101+
class="btn-cancel"
103102
id="userDeleteCancelBtn"
104103
(click)="hide()"
105104
>

eform-client/src/app/modules/account-management/components/users/users-page/users-page.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<eform-new-subheader>
22
<button
3-
mat-raised-button
4-
color="accent"
3+
class="btn-primary btn-primary--icon-left"
54
(click)="openNewUserModal()"
65
*ngIf="selectCurrentUserClaimsUsersCreate$ | async"
76
matTooltip="{{ 'Create user' | translate }}"

eform-client/src/app/modules/advanced/components/entity-select/entity-select/entity-select.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
matTooltipPosition="left"
88
[routerLink]="['/advanced/entity-select/create']"
99
>
10-
{{ 'New list' | translate }}
10+
<mat-icon>add</mat-icon>
11+
<span>{{ 'New list' | translate }}</span>
1112
</button>
1213
</eform-new-subheader>
1314

eform-client/src/app/modules/advanced/components/folders/folder-edit-create/folder-edit-create.component.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,16 @@ <h3 mat-dialog-title>{{(edit ? 'Edit folder' : 'New folder') | translate}}</h3>
6262
</ng-container>
6363
</div>
6464
</div>
65-
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
65+
<div mat-dialog-actions class="d-flex flex-row justify-content-end align-items-center gap-12">
6666
<button
67-
mat-raised-button
68-
color="accent"
67+
class="btn-primary btn-primary--icon-left"
6968
(click)="edit ? updateFolder() : createFolder()"
7069
id="{{edit ? 'saveEditBtn' : 'folderSaveBtn'}}"
7170
>
7271
{{(edit ? 'Save' : 'Create') | translate}}
7372
</button>
7473
<button
75-
mat-raised-button
74+
class="btn-cancel"
7675
id="{{edit ? 'cancelEditBtn' : 'cancelCreateBtn'}}"
7776
(click)="hide()"
7877
>

eform-client/src/app/modules/advanced/components/folders/folders/folders.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
(deleteNode)="openDeleteModal($event)"
1414
></app-eform-tree-view-picker>
1515
<button
16-
mat-raised-button
16+
class="btn-primary btn-primary--icon-left"
1717
style="margin-top: 10px"
1818
id="newFolderBtn"
1919
(click)="openCreateModal()"
2020
*ngIf="selectCurrentUserClaimsWorkersCreate$ | async"
2121
>
2222
<mat-icon>add</mat-icon>
23-
{{ 'Add new' | translate }}
23+
<span>{{ 'Add new' | translate }}</span>
2424
</button>
2525
</mat-card-content>
2626
</mat-card>

0 commit comments

Comments
 (0)