From b11cf7cbef08d060defeab5f876aafbbb8892e23 Mon Sep 17 00:00:00 2001
From: Alex Jackson <Alexander.Jackson@dorsetsoftware.com>
Date: Wed, 23 Jun 2021 15:14:25 +0100
Subject: [PATCH 1/2] HEEDLS-529 Fix back link spacing for Register journey
 pages

---
 .../Views/Register/LearnerInformation.cshtml  | 35 +++++++++----------
 .../Views/Register/Password.cshtml            | 18 +++++-----
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/Register/LearnerInformation.cshtml b/DigitalLearningSolutions.Web/Views/Register/LearnerInformation.cshtml
index 58392925af..8bde5ea846 100644
--- a/DigitalLearningSolutions.Web/Views/Register/LearnerInformation.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Register/LearnerInformation.cshtml
@@ -1,5 +1,4 @@
-@using DigitalLearningSolutions.Web.ViewModels.MyAccount
-@using DigitalLearningSolutions.Web.ViewModels.Register
+@using DigitalLearningSolutions.Web.ViewModels.Register
 @model LearnerInformationViewModel
 
 @{
@@ -9,24 +8,22 @@
 
 <div class="nhsuk-grid-row">
   <div class="nhsuk-grid-column-full">
-    <form method="post" asp-action="LearnerInformation">
-
-      @if (errorHasOccurred) {
-        <vc:error-summary order-of-property-names="@(new[] {
-           nameof(Model.JobGroup),
-           nameof(Model.Answer1),
-           nameof(Model.Answer2),
-           nameof(Model.Answer3),
-           nameof(Model.Answer4),
-           nameof(Model.Answer5),
-           nameof(Model.Answer6)
-        })"/>
-      }
-
-      <div class="nhsuk-u-margin-bottom-8">
-        <h1 id="page-heading" class="nhsuk-heading-xl">Learner information</h1>
-      </div>
+    @if (errorHasOccurred) {
+      <vc:error-summary order-of-property-names="@(new[] {
+                                                   nameof(Model.JobGroup),
+                                                   nameof(Model.Answer1),
+                                                   nameof(Model.Answer2),
+                                                   nameof(Model.Answer3),
+                                                   nameof(Model.Answer4),
+                                                   nameof(Model.Answer5),
+                                                   nameof(Model.Answer6)
+                                                 })"/>
+    }
+      
+    <h1 class="nhsuk-heading-xl">Learner information</h1>
 
+    <form class="nhsuk-u-margin-bottom-3" method="post" asp-action="LearnerInformation">
+      
       <vc:select-list
         asp-for="JobGroup"
         label="Job Group"
diff --git a/DigitalLearningSolutions.Web/Views/Register/Password.cshtml b/DigitalLearningSolutions.Web/Views/Register/Password.cshtml
index 1ee8a67d58..e97dd13a29 100644
--- a/DigitalLearningSolutions.Web/Views/Register/Password.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Register/Password.cshtml
@@ -8,15 +8,13 @@
 
 <div class="nhsuk-grid-row">
   <div class="nhsuk-grid-column-full">
-    <form method="post" asp-action="Password">
+    @if (errorHasOccurred) {
+      <vc:error-summary order-of-property-names="@(new[] { nameof(Model.Password), nameof(Model.ConfirmPassword) })"/>
+    }
 
-      @if (errorHasOccurred) {
-        <vc:error-summary order-of-property-names="@(new[] { nameof(Model.Password), nameof(Model.ConfirmPassword) })"/>
-      }
-
-      <div class="nhsuk-u-margin-bottom-8">
-        <h1 id="page-heading" class="nhsuk-heading-xl">Create password</h1>
-      </div>
+    <h1 class="nhsuk-heading-xl">Create password</h1>
+    
+    <form class="nhsuk-u-margin-bottom-3" method="post" asp-action="Password">
 
       <vc:text-input
         asp-for="Password"
@@ -26,7 +24,7 @@
         spell-check="false"
         autocomplete="new-password"
         hint-text="Your new password should have a minimum of 8 characters with at least 1 letter, 1 number and 1 symbol."
-        css-class="nhsuk-u-width-one-half"/>
+        css-class="nhsuk-u-width-one-half" />
 
       <vc:text-input
         asp-for="ConfirmPassword"
@@ -36,7 +34,7 @@
         spell-check="false"
         autocomplete="new-password"
         hint-text=""
-        css-class="nhsuk-u-width-one-half"/>
+        css-class="nhsuk-u-width-one-half" />
 
       <button class="nhsuk-button" type="submit">Next</button>
     </form>

From 9340ecd1362f542b19ee9e6cc4ec4b1cad4bbfaf Mon Sep 17 00:00:00 2001
From: Alex Jackson <Alexander.Jackson@dorsetsoftware.com>
Date: Wed, 23 Jun 2021 15:17:52 +0100
Subject: [PATCH 2/2] HEEDLS-529 Increase spacing for h1 on personal info page

---
 .../Views/Register/PersonalInformation.cshtml                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DigitalLearningSolutions.Web/Views/Register/PersonalInformation.cshtml b/DigitalLearningSolutions.Web/Views/Register/PersonalInformation.cshtml
index 3ec478c206..b6b6328a35 100644
--- a/DigitalLearningSolutions.Web/Views/Register/PersonalInformation.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Register/PersonalInformation.cshtml
@@ -14,7 +14,7 @@
       }
 
       <div class="nhsuk-u-margin-bottom-8">
-        <h1 id="page-heading" class="nhsuk-heading-xl">Register</h1>
+        <h1 class="nhsuk-heading-xl">Register</h1>
         <input type="hidden" asp-for="IsCentreSpecificRegistration" value="@Model.IsCentreSpecificRegistration" />
 
         @if (Model.IsCentreSpecificRegistration) {