From 270e6f7c6548ada32dfbbe2ad7439a092afe74ec Mon Sep 17 00:00:00 2001
From: Jiayee Lim <jiayeerawr@gmail.com>
Date: Sun, 27 Jun 2021 19:16:49 +0800
Subject: [PATCH 1/2] feat: in "Edit Welcome", move "Color Theme" to btwn
 "Logo" and "Time taken for..." and add rows="12" to "Instructions..."
 textarea

---
 .../views/edit-start-page.client.modal.html   | 53 +++++++++----------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/public/modules/forms/admin/views/edit-start-page.client.modal.html b/src/public/modules/forms/admin/views/edit-start-page.client.modal.html
index 26baf55798..6f5265e54e 100644
--- a/src/public/modules/forms/admin/views/edit-start-page.client.modal.html
+++ b/src/public/modules/forms/admin/views/edit-start-page.client.modal.html
@@ -114,6 +114,28 @@ <h2 class="modal-title">Edit Welcome</h2>
 
         <div class="row"><br /></div>
 
+        <div class="row description">
+          <div class="col-md-12 label-custom label-medium label-bottom">
+            Color Theme
+          </div>
+          <div class="col-md-12 color-field">
+            <div ng-repeat="color in vm.colorThemes">
+              <label
+                ng-class="vm.myform.startPage.colorTheme === '{{color}}' ? 'selected-color-field' : ''"
+                class="{{color}}"
+              >
+                <input
+                  type="radio"
+                  value="{{color}}"
+                  ng-model="vm.myform.startPage.colorTheme"
+                />
+              </label>
+            </div>
+          </div>
+        </div>
+
+        <div class="row"><br /></div>
+
         <div class="row question">
           <div class="col-md-12 label-custom label-medium label-bottom">
             Time Taken for Form (in minutes)
@@ -164,34 +186,13 @@ <h2 class="modal-title">Edit Welcome</h2>
               ng-model="vm.myform.startPage.paragraph"
               placeholder="e.g. 1) You will require your sales receipt to fill this reimbursement form."
               name="paragraph"
+              rows="12"
             ></textarea>
           </div>
         </div>
 
         <div class="row"><br /></div>
 
-        <div class="row description">
-          <div class="col-md-12 label-custom label-medium label-bottom">
-            Color Theme
-          </div>
-          <div class="col-md-12 color-field">
-            <div ng-repeat="color in vm.colorThemes">
-              <label
-                ng-class="vm.myform.startPage.colorTheme === '{{color}}' ? 'selected-color-field' : ''"
-                class="{{color}}"
-              >
-                <input
-                  type="radio"
-                  value="{{color}}"
-                  ng-model="vm.myform.startPage.colorTheme"
-                />
-              </label>
-            </div>
-          </div>
-        </div>
-
-        <div class="row"><br /></div>
-
         <div class="modal-footer row">
           <button
             type="submit"
@@ -207,13 +208,7 @@ <h2 class="modal-title">Edit Welcome</h2>
     </div>
 
     <div
-      class="
-        preview-page-panel
-        col-md-7
-        hidden-sm hidden-xs
-        container
-        no-padding
-      "
+      class="preview-page-panel col-md-7 hidden-sm hidden-xs container no-padding"
     >
       <form class="public-form">
         <start-page-component

From 1af086966ecceaaca30b3991c3942076cbf0d336 Mon Sep 17 00:00:00 2001
From: Jiayee Lim <jiayeerawr@gmail.com>
Date: Sun, 27 Jun 2021 19:28:35 +0800
Subject: [PATCH 2/2] chore: run formatter

---
 .../forms/admin/views/edit-start-page.client.modal.html   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/public/modules/forms/admin/views/edit-start-page.client.modal.html b/src/public/modules/forms/admin/views/edit-start-page.client.modal.html
index 6f5265e54e..94320edb25 100644
--- a/src/public/modules/forms/admin/views/edit-start-page.client.modal.html
+++ b/src/public/modules/forms/admin/views/edit-start-page.client.modal.html
@@ -208,7 +208,13 @@ <h2 class="modal-title">Edit Welcome</h2>
     </div>
 
     <div
-      class="preview-page-panel col-md-7 hidden-sm hidden-xs container no-padding"
+      class="
+        preview-page-panel
+        col-md-7
+        hidden-sm hidden-xs
+        container
+        no-padding
+      "
     >
       <form class="public-form">
         <start-page-component