Merge branch 'masudul-tikweb-master'

Author: renemadsen

eform-client/src/app/plugins/modules/backend-configuration-pn/components/properties/property-actions/property-delete-modal/property-delete-modal.component.html

@@ -17,17 +17,16 @@ <h3 mat-dialog-title>{{ 'Are you sure you want to delete' | translate }}?</h3>
     </div>
   </div>
 </div>
-<div mat-dialog-actions class="d-flex flex-row justify-content-end">
+<div mat-dialog-actions class="d-flex flex-row justify-content-end align-items-center gap-12">
   <button
-    mat-raised-button
-    color="warn"
+    class="btn-delete"
     (click)="deleteProperty()"
     id="propertyDeleteDeleteBtn"
   >
     {{'Delete' | translate}}
   </button>
   <button
-    mat-raised-button
+    class="btn-cancel"
     (click)="hide()"
     id="propertyDeleteCancelBtn"
   >

eform-client/src/app/plugins/modules/backend-configuration-pn/components/reports/report-header/report-header.component.html

@@ -1,5 +1,5 @@
 <form [formGroup]="generateForm">
-  <div class="d-flex flex-row need-wrapper">
+  <div class="d-flex flex-row need-wrapper" style="overflow: auto">
     <mat-form-field>
       <mat-label>{{'Select filter' | translate}}</mat-label>
       <mtx-select
@@ -26,18 +26,17 @@
       </mat-date-range-input>
       <mat-date-range-picker #picker></mat-date-range-picker>
     </mat-form-field>
-    <div class="d-flex flex-row align-items-center ml-4">
+    <div class="d-flex flex-row align-items-center ml-4 gap-12">
       <button
-        mat-raised-button
-        color="accent"
+        class="btn-primary btn-primary--icon-left"
         [disabled]="generateForm.invalid"
         (click)="onSubmit()"
         id="generateTableBtn"
       >
         {{ 'Generate' | translate }}
       </button>
       <button
-        mat-icon-button
+        class="btn-secondary btn-secondary--icon-rounded-border"
         [disabled]="generateForm.invalid"
         (click)="onWordSave()"
         id="generateWordBtn"
@@ -46,7 +45,7 @@
         <mat-icon svgIcon="file-word"></mat-icon>
       </button>
       <button
-        mat-icon-button
+        class="btn-secondary btn-secondary--icon-rounded-border"
         [disabled]="generateForm.invalid"
         (click)="onExcelSave()"
         id="generateExcelBtn"
@@ -55,7 +54,7 @@
         <mat-icon svgIcon="file-excel"></mat-icon>
       </button>
       <button
-        mat-icon-button
+        class="btn-secondary btn-secondary--icon-rounded-border"
         [disabled]="generateForm.invalid"
         (click)="onPdfSave()"
         id="generatePdfBtn"

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/documents/components/documents-actions/document-delete/documents-document-delete.component.html

@@ -58,8 +58,7 @@ <h6>{{'Rather than deleting the file, you can also hide the display of the file
       <div class="mt-3">
         <ng-container *ngIf="getFileNameByLanguage(translation.id)">
           <button
-            mat-icon-button
-            color="accent"
+            class="btn-secondary btn-secondary--icon-rounded-border"
             (click)="getFile(translation.id)"
             matTooltip="{{ 'Show PDF' | translate }}"
           >
@@ -71,17 +70,16 @@ <h6>{{'Rather than deleting the file, you can also hide the display of the file
   </mat-card>
 </div>
 </div>
-<div mat-dialog-actions class="d-flex flex-row justify-content-end">
+<div mat-dialog-actions class="d-flex flex-row justify-content-end align-items-center gap-12">
   <button
-    mat-raised-button
-    color="accent"
+    class="btn-delete"
     (click)="submitCaseDelete()"
     id="deleteDocumentSaveBtn"
   >
     {{ 'Delete' | translate }}
   </button>
   <button
-    mat-raised-button
+   class="btn-cancel"
     (click)="hide()"
     id="deleteDocumentCancelBtn"
   >

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/documents/components/documents-actions/document-edit/documents-document-edit.component.html

@@ -200,7 +200,7 @@ <h3 mat-dialog-title>{{ 'Edit document' | translate }}</h3>
       </mat-card>-->
     </div>
   </div>
-  <div mat-dialog-actions class="d-flex flex-row justify-content-end">
+  <div mat-dialog-actions class="d-flex flex-row justify-content-end align-items-center gap-12">
     <button
       class="btn-cancel"
       id="documentEditCancelBtn"

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/documents/components/documents-folders/documents-folder-delete/documents-folder-delete.component.html

@@ -27,15 +27,14 @@ <h3 mat-dialog-title>{{'Are you sure you want to delete the folder' | translate}
 </div>
 <div mat-dialog-actions class="d-flex flex-row justify-content-end">
   <button
-    mat-raised-button
-    color="warn"
+    class="btn-delete"
     id="saveDeleteBtn"
     (click)="deleteFolder()"
   >
     {{'Delete' | translate}}
   </button>
   <button
-    mat-raised-button
+    class="btn-cancel"
     id="cancelDeleteBtn"
     (click)="hide()"
   >

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/files/components/files-actions/file-create/file-create.component.html

@@ -1,32 +1,32 @@
 <eform-new-subheader forceStaticTitle="true" [title]="'Upload files' | translate">
-  <button
-    mat-raised-button
-    id="backBtn"
-    color="primary"
-    *ngIf="selectedFile === null"
-    [routerLink]="'..'"
-  >
-    {{'Back' | translate}}
-  </button>
-  <button
-    mat-raised-button
-    id="uploadFilesBtn"
-    (click)="uploadFiles()"
-    color="accent"
-    *ngIf="selectedFile === null"
-    [disabled]="disabledUploadBtn"
-  >
-    {{'Upload files' | translate}}
-  </button>
-  <button
-    mat-icon-button
-    id="manageTagsBtn"
-    matTooltip="{{ 'Manage tags' | translate }}"
-    (click)="openTagsModal()"
-    color="primary"
-  >
-    <mat-icon>discount</mat-icon>
-  </button>
+  <div class="d-flex flex-row justify-content-center align-items-center gap-12">
+    <button
+      class="btn-primary btn-primary--icon-left"
+      id="backBtn"
+      *ngIf="selectedFile === null"
+      [routerLink]="'..'"
+    >
+      {{'Back' | translate}}
+    </button>
+    <button
+      class="btn-primary btn-primary--icon-left"
+      id="uploadFilesBtn"
+      (click)="uploadFiles()"
+      *ngIf="selectedFile === null"
+      [disabled]="disabledUploadBtn"
+    >
+      <mat-icon>upload</mat-icon>
+      <span>{{'Upload files' | translate}}</span>
+    </button>
+    <button
+      class="btn-secondary btn-secondary--icon-rounded-border"
+      id="manageTagsBtn"
+      matTooltip="{{ 'Manage tags' | translate }}"
+      (click)="openTagsModal()"
+    >
+      <mat-icon>discount</mat-icon>
+    </button>
+  </div>
 </eform-new-subheader>
 
 <ng-container *ngIf="selectedFile === null">

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/files/components/files-container/files-container.component.html

@@ -1,29 +1,29 @@
 <eform-new-subheader>
-  <button
-    matSuffix
-    mat-icon-button
-    id="addNewFileBtn"
-    matTooltip="{{ 'Upload PDF' | translate }}"
-    routerLink="./create"
-    color="accent"
-  >
-    <mat-icon>file_upload</mat-icon>
-  </button>
-  <button
-    matSuffix
-    mat-icon-button
-    id="manageTagsBtn"
-    matTooltip="{{ 'Manage tags' | translate }}"
-    (click)="openTagsModal()"
-    color="primary"
-  >
-    <mat-icon>discount</mat-icon>
-  </button>
+  <div class="d-flex flex-row justify-content-center align-items-center gap-12">
+    <button
+      matSuffix
+      class="btn-secondary btn-secondary--icon-rounded-border"
+      id="addNewFileBtn"
+      matTooltip="{{ 'Upload PDF' | translate }}"
+      routerLink="./create"
+    >
+      <mat-icon>file_upload</mat-icon>
+    </button>
+    <button
+      matSuffix
+      class="btn-secondary btn-secondary--icon-rounded-border"
+      id="manageTagsBtn"
+      matTooltip="{{ 'Manage tags' | translate }}"
+      (click)="openTagsModal()"
+    >
+      <mat-icon>discount</mat-icon>
+    </button>
+  </div>
 </eform-new-subheader>
 
 <app-files-filters [availableTags]="availableTags" (updateTable)="updateTable()"></app-files-filters>
 
-<div class="d-flex flex-row justify-content-end mb-2">
+<div class="d-flex flex-row justify-content-end mb-4">
   <button
     class="btn-primary btn-primary--icon-left"
     [disabled]="selectedFileIds.length === 0"

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/property-workers/components/property-worker-delete-modal/property-worker-delete-modal.component.html

@@ -34,8 +34,7 @@ <h3 mat-dialog-title>{{'Are you sure you want to delete' | translate}}?</h3>
     {{'Cancel' | translate}}
   </button>
   <button
-    mat-raised-button
-    color="warn"
+    class="btn-delete"
     id="saveDeleteBtn"
     (click)="deleteSingle()"
   >

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/reports/components/report-header/report-header.component.html

@@ -1,5 +1,5 @@
 <form [formGroup]="generateForm">
-  <div class="d-flex flex-row need-wrapper">
+  <div class="d-flex flex-row need-wrapper align-items-start gap-12">
     <mat-form-field>
       <mat-label>{{'Select filter' | translate}}</mat-label>
       <mtx-select
@@ -26,7 +26,7 @@
       </mat-date-range-input>
       <mat-date-range-picker #picker></mat-date-range-picker>
     </mat-form-field>
-    <div class="d-flex flex-row align-items-center ml-4">
+    <div class="d-flex flex-row align-items-center gap-12 pr-4">
       <button
         class="btn-primary btn-primary--icon-left"
         [disabled]="generateForm.invalid"

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/components/task-management-actions/task-management-create-show-modal/task-management-create-show-modal.component.html

@@ -126,7 +126,7 @@ <h3 mat-dialog-title>{{(isCreate ? 'Create new task' : 'Edit task') | translate}
     ></textarea>
   </mat-form-field>
 </div>
-<div mat-dialog-actions class="d-flex flex-row justify-content-end">
+<div mat-dialog-actions class="d-flex flex-row justify-content-end align-items-center gap-12">
   <button
     class="btn-cancel"
     (click)="hide()"