From f541506fecf597f78961985085bf918d5ff17dd7 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Fri, 16 Aug 2024 13:25:43 +0100
Subject: [PATCH] Adjust styling

---
 app/views/merge_requests/_notification_banners.html.erb  | 4 ++--
 app/views/merge_requests/absorbing_organisation.html.erb | 2 +-
 app/views/merge_requests/helpdesk_ticket.html.erb        | 2 +-
 app/views/merge_requests/merging_organisations.html.erb  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/merge_requests/_notification_banners.html.erb b/app/views/merge_requests/_notification_banners.html.erb
index 7674773ab..38c05dbcd 100644
--- a/app/views/merge_requests/_notification_banners.html.erb
+++ b/app/views/merge_requests/_notification_banners.html.erb
@@ -2,7 +2,7 @@
   <%= govuk_notification_banner(title_text: "Important") do %>
     <p class="govuk-notification-banner__heading govuk-!-width-full" style="max-width: fit-content">
       The absorbing organisation must accept the Data Sharing Agreement before merging.
-    <p>
+    </p>
     <% if @merge_request.dpo_user %>
         Contact the Data Protection Officer: <%= link_to @merge_request.dpo_user.name, user_path(@merge_request.dpo_user.id) %>
       <% else %>
@@ -15,7 +15,7 @@
   <%= govuk_notification_banner(title_text: "Important") do %>
     <p class="govuk-notification-banner__heading govuk-!-width-full" style="max-width: fit-content">
       An error occurred while processing the merge.
-    <p>
+    </p>
     No changes have been made. Try beginning the merge again.
   <% end %>
 <% end %>
diff --git a/app/views/merge_requests/absorbing_organisation.html.erb b/app/views/merge_requests/absorbing_organisation.html.erb
index 40faa88f5..f50bfe943 100644
--- a/app/views/merge_requests/absorbing_organisation.html.erb
+++ b/app/views/merge_requests/absorbing_organisation.html.erb
@@ -11,7 +11,7 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds-from-desktop">
       <p class="govuk-hint">If organisations are merging into a new organisation, <%= govuk_link_to "create the new organisation", new_organisation_path %> first and then select it here.</p>
-
+      <br>
       <%= f.govuk_select(:absorbing_organisation_id,
         label: { text: "Select organisation name", class: "govuk-label--m" },
         "data-controller": "accessible-autocomplete") do %>
diff --git a/app/views/merge_requests/helpdesk_ticket.html.erb b/app/views/merge_requests/helpdesk_ticket.html.erb
index 18e06121b..e2a47653d 100644
--- a/app/views/merge_requests/helpdesk_ticket.html.erb
+++ b/app/views/merge_requests/helpdesk_ticket.html.erb
@@ -14,7 +14,7 @@
       <br>
       <div class="govuk-grid-row">
         <div class="govuk-grid-column-two-thirds-from-desktop">
-          <%= f.govuk_text_field :helpdesk_ticket, caption: { text: "Ticket number", class: "govuk-label--m" }, label: { text: "For example, MSD-12345" } %>
+          <%= f.govuk_text_field :helpdesk_ticket, caption: { text: "Ticket number", class: "govuk-label govuk-label--s" }, label: { text: "For example, MSD-12345", class: "app-!-colour-muted" } %>
           <%= f.hidden_field :page, value: "helpdesk_ticket" %>
           <div class="govuk-button-group">
             <%= f.govuk_submit submit_merge_request_button_text(request.query_parameters["referrer"]) %>
diff --git a/app/views/merge_requests/merging_organisations.html.erb b/app/views/merge_requests/merging_organisations.html.erb
index 76a03e16e..02df05032 100644
--- a/app/views/merge_requests/merging_organisations.html.erb
+++ b/app/views/merge_requests/merging_organisations.html.erb
@@ -11,7 +11,7 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds-from-desktop">
       <p class="govuk-hint">Add all organisations that are merging.</p>
-
+      <br>
       <%= render partial: "organisation_relationships/related_organisation_select_question", locals: {
         label: { text: "Select an organisation", class: "govuk-label--m" },
         field: :merging_organisation,