Merge pull request #2566 from mjpugh811/web-211-v1

Resolution to Web-211, single commit etc.

src/app/account-transfers/list-standing-instructions/list-standing-instructions.component.html

@@ -1,10 +1,12 @@
+<!-- Version 1 -->
+
 <mat-card class="container">
   <div class="layout-row-wrap gap-2px responsive-column">
     <div class="flex-fill" *ngIf="isFromClient">
       <span class="flex-40">
         <h3 class="mat-h3">{{ 'labels.heading.Client Type' | translate }}</h3>
       </span>
-      <span class="flex-60">
+      <span class="client-Name">
         <h3 class="mat-h3">{{ clientName }}</h3>
       </span>
     </div>
@@ -20,7 +22,7 @@
 
     <mat-divider [inset]="true"></mat-divider>
 
-    <mat-form-field class="flex-30">
+    <mat-form-field class="type-field">
       <mat-label>{{ 'labels.inputs.Type' | translate }}</mat-label>
       <mat-select [formControl]="transferType">
         <mat-option *ngFor="let transferTypeData of transferTypeDatas" [value]="transferTypeData.id">
@@ -29,7 +31,7 @@
       </mat-select>
     </mat-form-field>
 
-    <mat-form-field class="flex-30">
+    <mat-form-field class="account-Id-field">
       <input matInput placeholder="From Account Id" [formControl]="fromAccountId" />
     </mat-form-field>
 
@@ -40,7 +42,7 @@
       (click)="filterStandingInstructions()"
       class="filter-button"
     >
-      &nbsp;&nbsp;{{ 'labels.buttons.Filter' | translate }}
+      {{ 'labels.buttons.Filter' | translate | titlecase }}
     </button>
   </div>
 

src/app/account-transfers/list-standing-instructions/list-standing-instructions.component.scss

@@ -1,7 +1,9 @@
+// Version 1
+
 .container {
   .filter-button {
     height: 2.5rem;
-    margin-top: 1rem;
+    margin-top: 2rem;
   }
 }
 

src/main.scss

@@ -1,3 +1,5 @@
+// Version 1
+
 /*
  * Entry point of global application style.
  * Component-specific style should not go here and be included directly as part of the components.
@@ -611,3 +613,23 @@ mifosx-notifications-page td {
   justify-content: flex-start;
   width: 100%;
 }
+
+//Re-positions account type field on list standing instructions page
+.type-field {
+  position: absolute;
+  left: 1px;
+  top: 20px;
+}
+
+//Re-positions account id field on list standing instructions page
+.account-Id-field {
+  position: absolute;
+  left: 490px;
+  top: 20px;
+}
+
+//Re-positions client name label on list standing instructions page
+.client-Name {
+  position: absolute;
+  left: 490px;
+}