Merge pull request #1635 from bcgov/develop

Deployment PR - 1147
bcgov · Apr 30, 2024 · 1322b07 · 1322b07
2 parents 41e9533 + 70c3446
commit 1322b07
Show file tree

Hide file tree

Showing 49 changed files with 568 additions and 635 deletions.
diff --git a/...t-submission/change-application-type-dialog/change-application-type-dialog.component.html b/...t-submission/change-application-type-dialog/change-application-type-dialog.component.html
@@ -54,7 +54,7 @@ <h5>Are you sure you want to change your application type?</h5>
   </div>
 </div>
 
-<div mat-dialog-action class="dialog-action-container">
+<div mat-dialog-actions class="dialog-action-container" align="end">
   <div *ngIf="stepIdx === warningStep" class="dialog-controls-wrapper">
     <button mat-stroked-button color="primary" (click)="closeDialog()">cancel</button>
     <button mat-flat-button color="primary" (click)="next()">next</button>

diff --git a/...t-submission/change-application-type-dialog/change-application-type-dialog.component.scss b/...t-submission/change-application-type-dialog/change-application-type-dialog.component.scss
@@ -30,17 +30,13 @@
   }
 }
 
-.dialog-action-container {
-  margin: rem(4) 0;
-  padding: 0 rem(24);
-}
-
 .dialog-controls-wrapper {
   display: flex;
-  justify-content: space-between;
+  width: 100%;
+  gap: rem(16);
 
   button {
-    width: rem(116);
+    flex: 1 1 auto;
   }
 }
 
@@ -79,14 +75,15 @@
 
   .dialog-controls-wrapper {
     justify-content: flex-end;
-
-    button {
-      margin-left: rem(16) !important;
-    }
   }
 
   .dialog-action-container {
     margin: rem(24) 0;
+    width: unset;
+
+    button {
+      flex: unset;
+    }
   }
 
   .change-app-type-modal {

diff --git a/...ures/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/...ures/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="parcelForm" (keydown.enter)="$event.preventDefault()">
   <div class="type">
     <mat-label for="parcelType">Select parcel type:</mat-label>
-    <div class="warning">
+    <div>
       Fee simple includes privately-owned parcels and parcels within First Nation treaty lands. Crown land includes
       crown leases.
     </div>

diff --git a/...atures/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/...atures/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts
@@ -227,8 +227,6 @@ export class ParcelEntryComponent implements OnInit {
 
     if (this.showErrors) {
       this.parcelForm.markAllAsTouched();
-    } else {
-      this.parcelForm.controls.isFarm.markAsTouched();
     }
   }
 

diff --git a/.../app/features/applications/edit-submission/primary-contact/primary-contact.component.scss b/.../app/features/applications/edit-submission/primary-contact/primary-contact.component.scss
@@ -91,4 +91,16 @@ section {
     overflow: hidden;
     text-overflow: ellipsis;
   }
+
+  @media screen and (max-width: $tabletBreakpoint) {
+    .row {
+      flex-direction: column;
+      align-items: flex-start;
+    }
+
+    .key {
+      width: auto;
+      margin-bottom: rem(5);
+    }
+  }
 }
diff --git a/...edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.html b/...edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.html
@@ -77,7 +77,7 @@ <h5 class="full-row" *ngIf="type.getRawValue() === OWNER_TYPE.ORGANIZATION">Orga
     </div>
   </form>
 </div>
-<div mat-dialog-actions class="actions">
+<div mat-dialog-actions class="actions" align="end">
   <button mat-stroked-button color="primary" (click)="onClose()">Cancel</button>
   <button mat-flat-button color="primary" [disabled]="form.invalid || isLoading" *ngIf="!isEdit" (click)="onCreate()">
     Add

diff --git a/...edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.scss b/...edit-submission/proposal/cove-proposal/transferee-dialog/transferee-dialog.component.scss
@@ -2,8 +2,21 @@
 @use '../../../../../../../styles/colors';
 
 .actions {
-  button:not(:last-child) {
-    margin-right: rem(8) !important;
+  display: flex;
+  padding: rem(16) rem(24);
+  width: 100%;
+  gap: rem(16);
+
+  button {
+    flex: 1 1 auto;
+  }
+
+  @media screen and (min-width: $tabletBreakpoint) {
+    width: unset;
+
+    button {
+      flex: unset;
+    }
   }
 }