Browse Source

Adjust styling

pull/2589/head
Manny Dinssa 2 years ago
parent
commit
f541506fec
  1. 4
      app/views/merge_requests/_notification_banners.html.erb
  2. 2
      app/views/merge_requests/absorbing_organisation.html.erb
  3. 2
      app/views/merge_requests/helpdesk_ticket.html.erb
  4. 2
      app/views/merge_requests/merging_organisations.html.erb

4
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 %>

2
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 %>

2
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"]) %>

2
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,

Loading…
Cancel
Save