Merge branch 'main' into feature/sonar-analysis-on-push

DFE-Digital · Aug 5, 2024 · a286a51 · a286a51
2 parents 6a250af + 4d57c55
commit a286a51
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml
@@ -69,7 +69,7 @@
         <form id="check-additional-requirements" asp-controller="CheckAdditionalRequirements" asp-action="Post" method="post">
             <input type="hidden" name="qualificationId" value="@Model.QualificationId">
             <div id="additional-requirements-form-group" class="govuk-form-group">
-                <h4 id="radio-heading" class="govuk-heading-m">@Model.QuestionSectionHeading</h4>
+                <h3 id="radio-heading" class="govuk-heading-l govuk-!-static-margin-top-8">@Model.QuestionSectionHeading</h3>
                 <input type="hidden" name="QuestionCount" value="@Model.QuestionCount"/>
                 @for (var qi = 0; qi < Model.AdditionalRequirementQuestions.Count; qi++)
                 {
@@ -84,7 +84,7 @@
                             @if (!string.IsNullOrEmpty(question.HintText))
                             {
                                 var hintId = $"{questionId}_hint";
-                                <p class="govuk-body" id="@hintId">@question.HintText</p>
+                                <p class="govuk-hint" id="@hintId">@question.HintText</p>
                             }
                             @if (Model.AdditionalRequirementQuestions[qi].HasError)
                             {
@@ -122,6 +122,7 @@
                             }
                         </fieldset>
                     </div>
+                    <hr/>
                 }
             </div>
             <div class="govuk-warning-text">

diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml
@@ -69,7 +69,7 @@
             <div id="confirm-qualification-form-group" class="govuk-form-group @(Model.HasErrors ? "govuk-form-group--error" : "")">
                 <fieldset class="govuk-fieldset" role="group" aria-describedby="confirm-qualification-choice-error">
                     <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
-                        <h4 id="radio-heading" class="govuk-heading-m">@Model.RadioHeading</h4>
+                        <h4 id="radio-heading" class="govuk-heading-m mb-0">@Model.RadioHeading</h4>
                     </legend>
 
                     @if (Model.HasErrors)

diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml
@@ -25,12 +25,12 @@
         <div id="post-filter-content">@Html.Raw(Model.PostSearchCriteriaContent)</div>
     </div>
     <div class="govuk-grid-column-two-thirds">
-        <h1 id="heading" class="govuk-heading-l">@Model.Header</h1>
-        <h3 id="found-heading" class="govuk-body-l">
+        <h1 id="heading" class="govuk-heading-xl mb-8">@Model.Header</h1>
+        <h2 id="found-heading" class="govuk-!-static-margin-bottom-8">
             <strong>
                 @Model.Qualifications.Count @(Model.Qualifications.Count == 1 ? Model.SingleQualificationFoundText : Model.MultipleQualificationsFoundText)
             </strong>
-        </h3>
+        </h2>
         <div id="pre-search-content">@Html.Raw(Model.PreSearchBoxContent)</div>
         <div class="govuk-form-group">
             @using (Html.BeginForm("Refine", "QualificationDetails", FormMethod.Post))

diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Date.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Date.cshtml
@@ -25,8 +25,8 @@
         {
             <div class="govuk-form-group @(Model.HasErrors ? "govuk-form-group--error" : "")">
                 <fieldset class="govuk-fieldset govuk-!-margin-bottom-4">
-                    <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
-                        <h1 class="govuk-fieldset__heading" id="question">
+                    <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
+                        <h1 class="govuk-fieldset__heading mb-1" id="question">
                             @Model.Question
                         </h1>
                     </legend>

diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml
@@ -37,7 +37,7 @@
             <div class="govuk-form-group @(Model.HasErrors ? "govuk-form-group--error" : "")">
                 <fieldset class="govuk-fieldset govuk-!-margin-bottom-4">
                     <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
-                        <h1 class="govuk-heading-l" id="question">
+                        <h1 class="govuk-heading-xl mb-1" id="question">
                             @Model.Question
                         </h1>
                     </legend>

diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Radio.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Radio.cshtml
@@ -26,7 +26,7 @@
             <div class="govuk-form-group @(Model.HasErrors ? "govuk-form-group--error" : "")">
                 <fieldset class="govuk-fieldset govuk-!-margin-bottom-4">
                     <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
-                        <h1 class="govuk-heading-l" id="question">
+                        <h1 class="govuk-heading-xl mb-1" id="question">
                             @Model.Question
                         </h1>
                     </legend>