From adbbba65aa8355dfed0970c12749f5c34e16c81b Mon Sep 17 00:00:00 2001
From: James Chan <james.chan@digital.cabinet-office.gov.uk>
Date: Wed, 19 Feb 2025 12:17:20 +0000
Subject: [PATCH 1/3] Replace title component with heading component

Update templates to call the heading component; update presenters (rename instances of TitleAndContext/title_and_context to HeadingAndContext/heading_and_context; replace t.delete(:average_title_length) with t[:font_size] = 'xl' (average_title_length is used by the title component to set either a large or extra large font size of the heading however the heading component does not use this option. Therefore, we directly set the heading size to large in heading_and_context.rb and use the override seen here when we want an extra large font size); update/fix tests)
---
 app/presenters/call_for_evidence_presenter.rb     |  2 +-
 app/presenters/case_study_presenter.rb            |  2 +-
 app/presenters/consultation_presenter.rb          |  2 +-
 app/presenters/contact_presenter.rb               |  6 +++---
 ...itle_and_context.rb => heading_and_context.rb} | 10 ++++++----
 .../corporate_information_page_presenter.rb       |  6 +++---
 app/presenters/detailed_guide_presenter.rb        |  4 ++--
 app/presenters/document_collection_presenter.rb   |  2 +-
 app/presenters/fatality_notice_presenter.rb       |  4 ++--
 app/presenters/field_of_operation_presenter.rb    |  8 ++++----
 app/presenters/fields_of_operation_presenter.rb   |  6 +++---
 app/presenters/news_article_presenter.rb          |  2 +-
 app/presenters/specialist_document_presenter.rb   |  4 ++--
 app/presenters/speech_presenter.rb                |  2 +-
 app/presenters/statistical_data_set_presenter.rb  |  2 +-
 .../statistics_announcement_presenter.rb          |  2 +-
 .../topical_event_about_page_presenter.rb         |  6 +++---
 app/presenters/working_group_presenter.rb         |  6 +++---
 .../_body_with_related_links.html.erb             |  8 ++++++--
 .../content_items/call_for_evidence.html.erb      |  4 ++--
 app/views/content_items/case_study.html.erb       |  2 +-
 app/views/content_items/consultation.html.erb     |  5 +++--
 app/views/content_items/contact.html.erb          |  2 +-
 .../corporate_information_page.html.erb           |  7 ++++++-
 app/views/content_items/detailed_guide.html.erb   |  4 ++--
 .../content_items/document_collection.html.erb    | 11 +++++++----
 app/views/content_items/fatality_notice.html.erb  |  2 +-
 .../content_items/field_of_operation.html.erb     |  2 +-
 .../content_items/fields_of_operation.html.erb    |  2 +-
 app/views/content_items/gone.html.erb             |  7 +++++--
 app/views/content_items/guide.html+print.erb      |  8 +++++---
 app/views/content_items/guide.html.erb            | 14 ++++++++++++--
 app/views/content_items/guide_single.html.erb     |  7 ++++++-
 .../content_items/how_government_works.html.erb   |  7 +++++--
 app/views/content_items/news_article.html.erb     |  2 +-
 app/views/content_items/publication.html.erb      |  9 ++++++---
 .../content_items/service_manual_guide.html.erb   |  6 ++++--
 .../service_manual_service_standard.html.erb      |  7 +++++--
 .../content_items/service_manual_topic.html.erb   |  6 ++++--
 .../service_sign_in/_choose_sign_in.html.erb      |  7 ++++++-
 .../service_sign_in/_create_new_account.html.erb  |  7 ++++++-
 .../content_items/specialist_document.html.erb    |  2 +-
 app/views/content_items/speech.html.erb           |  2 +-
 .../content_items/statistical_data_set.html.erb   | 11 +++++++----
 .../statistics_announcement.html.erb              |  2 +-
 app/views/content_items/working_group.html.erb    |  2 +-
 app/views/development/index.html.erb              |  7 ++++++-
 app/views/histories/history.html.erb              |  7 +++++--
 app/views/shared/_title_and_translations.html.erb |  2 +-
 .../service_manual_service_standard_test.rb       |  4 ++--
 .../corporate_information_page_presenter_test.rb  |  8 ++++----
 test/presenters/detailed_guide_presenter_test.rb  |  2 +-
 .../field_of_operation_presenter_test.rb          | 15 +++++++++------
 .../fields_of_operation_presenter_test.rb         | 11 +++++++----
 .../specialist_document_presenter_test.rb         | 15 ++++++++-------
 55 files changed, 189 insertions(+), 113 deletions(-)
 rename app/presenters/content_item/{title_and_context.rb => heading_and_context.rb} (61%)

diff --git a/app/presenters/call_for_evidence_presenter.rb b/app/presenters/call_for_evidence_presenter.rb
index 9dc1ba8f0..a1c5b4264 100644
--- a/app/presenters/call_for_evidence_presenter.rb
+++ b/app/presenters/call_for_evidence_presenter.rb
@@ -6,7 +6,7 @@ class CallForEvidencePresenter < ContentItemPresenter
   include ContentItem::Political
   include ContentItem::Shareable
   include ContentItem::SinglePageNotificationButton
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
   def opening_date_time
     content_item["details"]["opening_date"]
diff --git a/app/presenters/case_study_presenter.rb b/app/presenters/case_study_presenter.rb
index 4a13af58e..33d179653 100644
--- a/app/presenters/case_study_presenter.rb
+++ b/app/presenters/case_study_presenter.rb
@@ -1,7 +1,7 @@
 class CaseStudyPresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::Metadata
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
   def image
     content_item["details"]["image"]
diff --git a/app/presenters/consultation_presenter.rb b/app/presenters/consultation_presenter.rb
index af31a53f6..9916efd24 100644
--- a/app/presenters/consultation_presenter.rb
+++ b/app/presenters/consultation_presenter.rb
@@ -6,7 +6,7 @@ class ConsultationPresenter < ContentItemPresenter
   include ContentItem::Political
   include ContentItem::Shareable
   include ContentItem::SinglePageNotificationButton
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
   def opening_date_time
     content_item["details"]["opening_date"]
diff --git a/app/presenters/contact_presenter.rb b/app/presenters/contact_presenter.rb
index 722757a9d..ca39cc769 100644
--- a/app/presenters/contact_presenter.rb
+++ b/app/presenters/contact_presenter.rb
@@ -1,10 +1,10 @@
 class ContactPresenter < ContentItemPresenter
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::ContactDetails
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
-      t.delete(:average_title_length)
+      t[:font_size] = "xl"
       t.delete(:context)
     end
   end
diff --git a/app/presenters/content_item/title_and_context.rb b/app/presenters/content_item/heading_and_context.rb
similarity index 61%
rename from app/presenters/content_item/title_and_context.rb
rename to app/presenters/content_item/heading_and_context.rb
index d217ed0c1..6ffdbab06 100644
--- a/app/presenters/content_item/title_and_context.rb
+++ b/app/presenters/content_item/heading_and_context.rb
@@ -1,11 +1,13 @@
 module ContentItem
-  module TitleAndContext
-    def title_and_context
+  module HeadingAndContext
+    def heading_and_context
       {
-        title:,
+        text: title,
         context: I18n.t("content_item.schema_name.#{document_type}", count: 1),
         context_locale: view_context.t_locale_fallback("content_item.schema_name.#{document_type}", count: 1),
-        average_title_length: "long",
+        heading_level: 1,
+        margin_bottom: 8,
+        font_size: "l",
       }
     end
   end
diff --git a/app/presenters/corporate_information_page_presenter.rb b/app/presenters/corporate_information_page_presenter.rb
index 252146e14..4ec3a542f 100644
--- a/app/presenters/corporate_information_page_presenter.rb
+++ b/app/presenters/corporate_information_page_presenter.rb
@@ -1,7 +1,7 @@
 class CorporateInformationPagePresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::ContentsList
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::OrganisationBranding
   include ContentItem::CorporateInformationGroups
 
@@ -11,9 +11,9 @@ def page_title
     page_title
   end
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
-      t.delete(:average_title_length)
+      t[:font_size] = "xl"
       t.delete(:context)
     end
   end
diff --git a/app/presenters/detailed_guide_presenter.rb b/app/presenters/detailed_guide_presenter.rb
index 24125ec06..6d3b0be7e 100644
--- a/app/presenters/detailed_guide_presenter.rb
+++ b/app/presenters/detailed_guide_presenter.rb
@@ -4,10 +4,10 @@ class DetailedGuidePresenter < ContentItemPresenter
   include ContentItem::Metadata
   include ContentItem::NationalApplicability
   include ContentItem::Political
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::SinglePageNotificationButton
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
       t[:context] = I18n.t("content_item.schema_name.guidance", count: 1)
     end
diff --git a/app/presenters/document_collection_presenter.rb b/app/presenters/document_collection_presenter.rb
index 7fc71b85e..a7d1d6f65 100644
--- a/app/presenters/document_collection_presenter.rb
+++ b/app/presenters/document_collection_presenter.rb
@@ -2,7 +2,7 @@ class DocumentCollectionPresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::Metadata
   include ContentItem::Political
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::ContentsList
   include ContentItem::SinglePageNotificationButton
   include DocumentCollection::SignupLink
diff --git a/app/presenters/fatality_notice_presenter.rb b/app/presenters/fatality_notice_presenter.rb
index c307f9a92..b36d595fd 100644
--- a/app/presenters/fatality_notice_presenter.rb
+++ b/app/presenters/fatality_notice_presenter.rb
@@ -1,6 +1,6 @@
 class FatalityNoticePresenter < ContentItemPresenter
   include ContentItem::Body
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::Metadata
 
   def field_of_operation
@@ -23,7 +23,7 @@ def important_metadata
     end
   end
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
       if field_of_operation
         t[:context] = I18n.t("fatality_notice.operations_in", location: field_of_operation.try(:title))
diff --git a/app/presenters/field_of_operation_presenter.rb b/app/presenters/field_of_operation_presenter.rb
index 929a1a9cf..4923fa4fb 100644
--- a/app/presenters/field_of_operation_presenter.rb
+++ b/app/presenters/field_of_operation_presenter.rb
@@ -1,13 +1,13 @@
 class FieldOfOperationPresenter < ContentItemPresenter
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
   FatalityNotice = Struct.new(:roll_call_introduction, :casualties, :title, :base_path)
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
       t[:context] = I18n.t("field_of_operation.context")
-      t[:title] = "#{I18n.t('field_of_operation.title')} #{@content_item['title']}"
-      t.delete(:average_title_length)
+      t[:text] = "#{I18n.t('field_of_operation.title')} #{@content_item['title']}"
+      t[:font_size] = "xl"
     end
   end
 
diff --git a/app/presenters/fields_of_operation_presenter.rb b/app/presenters/fields_of_operation_presenter.rb
index 4c3d1dbdf..b670725f5 100644
--- a/app/presenters/fields_of_operation_presenter.rb
+++ b/app/presenters/fields_of_operation_presenter.rb
@@ -1,14 +1,14 @@
 class FieldsOfOperationPresenter < ContentItemPresenter
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
   def fields_of_operation
     content_item.dig("links", "fields_of_operation").map { |field| [field["title"], field["base_path"]] }
   end
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
       t[:context] = I18n.t("fields_of_operation.context")
-      t.delete(:average_title_length)
+      t[:font_size] = "xl"
     end
   end
 end
diff --git a/app/presenters/news_article_presenter.rb b/app/presenters/news_article_presenter.rb
index bfb2e2eb7..b279aa1b7 100644
--- a/app/presenters/news_article_presenter.rb
+++ b/app/presenters/news_article_presenter.rb
@@ -4,7 +4,7 @@ class NewsArticlePresenter < ContentItemPresenter
   include ContentItem::Linkable
   include ContentItem::Updatable
   include ContentItem::Shareable
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::Metadata
   include ContentItem::NewsImage
 end
diff --git a/app/presenters/specialist_document_presenter.rb b/app/presenters/specialist_document_presenter.rb
index 6e54e371f..eb2fb895d 100644
--- a/app/presenters/specialist_document_presenter.rb
+++ b/app/presenters/specialist_document_presenter.rb
@@ -2,12 +2,12 @@ class SpecialistDocumentPresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::Updatable
   include ContentItem::Linkable
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::Metadata
   include TypographyHelper
   include ContentItem::ContentsList
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
       t.delete(:context)
     end
diff --git a/app/presenters/speech_presenter.rb b/app/presenters/speech_presenter.rb
index 7d702f5c8..5970a2aa4 100644
--- a/app/presenters/speech_presenter.rb
+++ b/app/presenters/speech_presenter.rb
@@ -3,7 +3,7 @@ class SpeechPresenter < ContentItemPresenter
   include ContentItem::Linkable
   include ContentItem::Political
   include ContentItem::Updatable
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::Metadata
   include ContentItem::NewsImage
 
diff --git a/app/presenters/statistical_data_set_presenter.rb b/app/presenters/statistical_data_set_presenter.rb
index 824689207..840ba842d 100644
--- a/app/presenters/statistical_data_set_presenter.rb
+++ b/app/presenters/statistical_data_set_presenter.rb
@@ -1,7 +1,7 @@
 class StatisticalDataSetPresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::ContentsList
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::Political
   include ContentItem::Metadata
 end
diff --git a/app/presenters/statistics_announcement_presenter.rb b/app/presenters/statistics_announcement_presenter.rb
index 1b22178b4..ac0013d2e 100644
--- a/app/presenters/statistics_announcement_presenter.rb
+++ b/app/presenters/statistics_announcement_presenter.rb
@@ -1,7 +1,7 @@
 class StatisticsAnnouncementPresenter < ContentItemPresenter
   include ContentItem::Metadata
   include ContentItem::NationalStatisticsLogo
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include StatisticsAnnouncementHelper
 
   FORTHCOMING_NOTICE = I18n.t("statistics_announcement.forthcoming").freeze
diff --git a/app/presenters/topical_event_about_page_presenter.rb b/app/presenters/topical_event_about_page_presenter.rb
index 1848c01e5..f46a663e2 100644
--- a/app/presenters/topical_event_about_page_presenter.rb
+++ b/app/presenters/topical_event_about_page_presenter.rb
@@ -1,11 +1,11 @@
 class TopicalEventAboutPagePresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::ContentsList
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
-      t.delete(:average_title_length)
+      t[:font_size] = "xl"
       t.delete(:context)
     end
   end
diff --git a/app/presenters/working_group_presenter.rb b/app/presenters/working_group_presenter.rb
index 3180b1645..ee4cdb378 100644
--- a/app/presenters/working_group_presenter.rb
+++ b/app/presenters/working_group_presenter.rb
@@ -1,7 +1,7 @@
 class WorkingGroupPresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::ContentsList
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
   def email
     content_item["details"]["email"]
@@ -19,9 +19,9 @@ def policies
     content_item["links"]["policies"]
   end
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
-      t.delete(:average_title_length)
+      t[:font_size] = "xl"
       t.delete(:context)
     end
   end
diff --git a/app/views/content_items/_body_with_related_links.html.erb b/app/views/content_items/_body_with_related_links.html.erb
index e68b8ce3f..306fbd77d 100644
--- a/app/views/content_items/_body_with_related_links.html.erb
+++ b/app/views/content_items/_body_with_related_links.html.erb
@@ -2,8 +2,12 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title',
-      title: @content_item.title %>
+    <%= render 'govuk_publishing_components/components/heading',
+      text: @content_item.title,
+      heading_level: 1,
+      font_size: "xl",
+      margin_bottom: 8
+    %>
   </div>
 </div>
 <div class="govuk-grid-row">
diff --git a/app/views/content_items/call_for_evidence.html.erb b/app/views/content_items/call_for_evidence.html.erb
index 042bbeb1f..e22668be2 100644
--- a/app/views/content_items/call_for_evidence.html.erb
+++ b/app/views/content_items/call_for_evidence.html.erb
@@ -4,11 +4,11 @@
   ) %>
 <% end %>
 
-<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.title_and_context[:title] } %>
+<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.heading_and_context[:text] } %>
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
 </div>
diff --git a/app/views/content_items/case_study.html.erb b/app/views/content_items/case_study.html.erb
index 25df21333..52a7414e3 100644
--- a/app/views/content_items/case_study.html.erb
+++ b/app/views/content_items/case_study.html.erb
@@ -6,7 +6,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds responsive-top-margin">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/content_items/consultation.html.erb b/app/views/content_items/consultation.html.erb
index 15773b4a5..d54aa64af 100644
--- a/app/views/content_items/consultation.html.erb
+++ b/app/views/content_items/consultation.html.erb
@@ -4,11 +4,12 @@
   ) %>
 <% end %>
 
-<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.title_and_context[:title] } %>
+<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.heading_and_context[:text] } %>
+
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
 </div>
diff --git a/app/views/content_items/contact.html.erb b/app/views/content_items/contact.html.erb
index ed24e5819..251812a3f 100644
--- a/app/views/content_items/contact.html.erb
+++ b/app/views/content_items/contact.html.erb
@@ -8,7 +8,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
 </div>
 
diff --git a/app/views/content_items/corporate_information_page.html.erb b/app/views/content_items/corporate_information_page.html.erb
index 3b12f3015..950c8884d 100644
--- a/app/views/content_items/corporate_information_page.html.erb
+++ b/app/views/content_items/corporate_information_page.html.erb
@@ -29,7 +29,12 @@
 <div class="<%= @content_item.organisation_brand_class %>">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <%= render 'govuk_publishing_components/components/title', title: @content_item.title %>
+      <%= render 'govuk_publishing_components/components/heading', 
+        text: @content_item.title,
+        heading_level: 1,
+        font_size: "xl",
+        margin_bottom: 8
+      %>
     </div>
     <%= render 'shared/translations' %>
     <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/content_items/detailed_guide.html.erb b/app/views/content_items/detailed_guide.html.erb
index 7362d04c2..16a51d7db 100644
--- a/app/views/content_items/detailed_guide.html.erb
+++ b/app/views/content_items/detailed_guide.html.erb
@@ -4,11 +4,11 @@
   ) %>
 <% end %>
 
-<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.title_and_context[:title] } %>
+<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.heading_and_context[:text] } %>
 
 <div class="govuk-grid-row gem-print-columns-none">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/content_items/document_collection.html.erb b/app/views/content_items/document_collection.html.erb
index 77208678b..ad3f8936e 100644
--- a/app/views/content_items/document_collection.html.erb
+++ b/app/views/content_items/document_collection.html.erb
@@ -4,14 +4,17 @@
   ) %>
 <% end %>
 
-<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.title_and_context[:title] } %>
+<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.heading_and_context[:text] } %>
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title',
+    <%= render 'govuk_publishing_components/components/heading',
        context: t("content_item.schema_name.#{@content_item.document_type}", count: 1),
-       title: @content_item.title,
-       average_title_length: "long" %>
+       text: @content_item.title,
+       heading_level: 1,
+       font_size: "l",
+       margin_bottom: 8
+      %>
   </div>
   <%= render 'shared/translations', content_item: @content_item %>
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/content_items/fatality_notice.html.erb b/app/views/content_items/fatality_notice.html.erb
index 95d321bc5..1a3f3ecb7 100644
--- a/app/views/content_items/fatality_notice.html.erb
+++ b/app/views/content_items/fatality_notice.html.erb
@@ -6,7 +6,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/content_items/field_of_operation.html.erb b/app/views/content_items/field_of_operation.html.erb
index cec9fc745..7df1de25a 100644
--- a/app/views/content_items/field_of_operation.html.erb
+++ b/app/views/content_items/field_of_operation.html.erb
@@ -1,7 +1,7 @@
 <div class="govuk-width-container">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <%= render "govuk_publishing_components/components/title", @content_item.title_and_context %>
+      <%= render "govuk_publishing_components/components/heading", @content_item.heading_and_context %>
     </div>
     <div class="govuk-grid-column-one-third govuk-!-margin-top-8 govuk-!-margin-bottom-8">
       <%= render "govuk_publishing_components/components/organisation_logo", {
diff --git a/app/views/content_items/fields_of_operation.html.erb b/app/views/content_items/fields_of_operation.html.erb
index 463cd9c0d..773d2624f 100644
--- a/app/views/content_items/fields_of_operation.html.erb
+++ b/app/views/content_items/fields_of_operation.html.erb
@@ -1,6 +1,6 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
 
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/content_items/gone.html.erb b/app/views/content_items/gone.html.erb
index 5536a4e4a..d24a116cc 100644
--- a/app/views/content_items/gone.html.erb
+++ b/app/views/content_items/gone.html.erb
@@ -1,7 +1,10 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render "govuk_publishing_components/components/title", {
-      title: t("gone.title"),
+    <%= render "govuk_publishing_components/components/heading", {
+      text: t("gone.title"),
+      heading_level: 1,
+      font_size: "xl",
+      margin_bottom: 8
     } %>
 
     <p class="summary govuk-!-font-size-19 govuk-!-margin-bottom-3">
diff --git a/app/views/content_items/guide.html+print.erb b/app/views/content_items/guide.html+print.erb
index 73dba2d32..1f1e7ce46 100644
--- a/app/views/content_items/guide.html+print.erb
+++ b/app/views/content_items/guide.html+print.erb
@@ -8,9 +8,11 @@
 
 <div class="govuk-grid-row gem-print-columns-none" id="guide-print">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', {
-      margin_bottom: 6,
-      title: @content_item.title,
+    <%= render 'govuk_publishing_components/components/heading', {
+      text: @content_item.title,
+      heading_level: 1,
+      font_size: "xl",
+      margin_bottom: 6
     } %>
 
     <div class="govuk-!-display-none-print">
diff --git a/app/views/content_items/guide.html.erb b/app/views/content_items/guide.html.erb
index ead0a4a01..d2dd373ff 100644
--- a/app/views/content_items/guide.html.erb
+++ b/app/views/content_items/guide.html.erb
@@ -20,9 +20,19 @@
 <div class="govuk-grid-row gem-print-columns-none">
   <div class="govuk-grid-column-two-thirds">
     <% if show_contents_list_ab_test? %>
-      <%= render 'govuk_publishing_components/components/title', { title: @content_item.title } %>
+      <%= render 'govuk_publishing_components/components/heading', { 
+        text: @content_item.title,
+        heading_level: 1,
+        font_size: "xl",
+        margin_bottom: 8
+      } %>
     <% else %>
-      <%= render 'govuk_publishing_components/components/title', { title: @content_item.content_title } %>
+      <%= render 'govuk_publishing_components/components/heading', { 
+        text: @content_item.content_title,
+        heading_level: 1,
+        font_size: "xl",
+        margin_bottom: 8
+      } %>
     <% end %>
     <% if show_contents_list_ab_test? || @content_item.show_guide_navigation? %>
       <%= render "govuk_publishing_components/components/skip_link", {
diff --git a/app/views/content_items/guide_single.html.erb b/app/views/content_items/guide_single.html.erb
index 8f5dee383..0b3037d93 100644
--- a/app/views/content_items/guide_single.html.erb
+++ b/app/views/content_items/guide_single.html.erb
@@ -17,7 +17,12 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', { title: @content_item.content_title } %>
+    <%= render 'govuk_publishing_components/components/heading', { 
+      text: @content_item.content_title,
+      heading_level: 1,
+      font_size: "xl",
+      margin_bottom: 8
+    } %>
 
     <% if @content_item.show_guide_navigation? %>
       <aside class="part-navigation-container" role="complementary">
diff --git a/app/views/content_items/how_government_works.html.erb b/app/views/content_items/how_government_works.html.erb
index 2089a6159..619bc66c7 100644
--- a/app/views/content_items/how_government_works.html.erb
+++ b/app/views/content_items/how_government_works.html.erb
@@ -1,8 +1,11 @@
 <div class="govuk-width-container">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <%= render "govuk_publishing_components/components/title", {
-        title: "How government works",
+      <%= render "govuk_publishing_components/components/heading", {
+        text: "How government works",
+        heading_level: 1,
+        font_size: "xl",
+        margin_bottom: 8
       } %>
 
       <%= render "govuk_publishing_components/components/lead_paragraph", {
diff --git a/app/views/content_items/news_article.html.erb b/app/views/content_items/news_article.html.erb
index ad56d962a..56c72cda7 100644
--- a/app/views/content_items/news_article.html.erb
+++ b/app/views/content_items/news_article.html.erb
@@ -6,7 +6,7 @@
 
 <div class="govuk-grid-row gem-print-columns-none">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/content_items/publication.html.erb b/app/views/content_items/publication.html.erb
index 6abde2b98..34f326c0b 100644
--- a/app/views/content_items/publication.html.erb
+++ b/app/views/content_items/publication.html.erb
@@ -12,11 +12,14 @@
 
 <div class="govuk-grid-row gem-print-columns-none">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title',
+    <%= render 'govuk_publishing_components/components/heading',
       context: t("content_item.schema_name.#{@content_item.document_type}", count: 1),
       context_locale: t_locale_fallback("content_item.schema_name.#{@content_item.document_type}", count: 1),
-      title: @content_item.title,
-      average_title_length: "long" %>
+      text: @content_item.title,
+      heading_level: 1,
+      font_size: "l",
+      margin_bottom: 8
+    %>
   </div>
   <%= render 'shared/translations' %>
 
diff --git a/app/views/content_items/service_manual_guide.html.erb b/app/views/content_items/service_manual_guide.html.erb
index 4b343c3ab..43e2041e9 100644
--- a/app/views/content_items/service_manual_guide.html.erb
+++ b/app/views/content_items/service_manual_guide.html.erb
@@ -22,9 +22,11 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
       <div class="app-page-header">
-        <%= render "govuk_publishing_components/components/title", {
+        <%= render "govuk_publishing_components/components/heading", {
           context: @content_item.category_title,
-          title: @content_item.title,
+          text: @content_item.title,
+          heading_level: 1,
+          font_size: "xl",
           margin_bottom: 8
         } %>
         <% if @content_item.show_description? %>
diff --git a/app/views/content_items/service_manual_service_standard.html.erb b/app/views/content_items/service_manual_service_standard.html.erb
index ca5ad7b0e..eb8395322 100644
--- a/app/views/content_items/service_manual_service_standard.html.erb
+++ b/app/views/content_items/service_manual_service_standard.html.erb
@@ -16,8 +16,11 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
       <div class="app-page-header govuk-!-margin-top-3 govuk-!-margin-bottom-3">
-        <%= render "govuk_publishing_components/components/title", {
-          title: @content_item.title,
+        <%= render "govuk_publishing_components/components/heading", {
+          text: @content_item.title,
+          heading_level: 1,
+          font_size: "xl",
+          margin_bottom: 8
         } %>
         <p class="govuk-body-l govuk-!-margin-bottom-7 app-page-header__summary">
           <%= @content_item.content_item["description"] %>
diff --git a/app/views/content_items/service_manual_topic.html.erb b/app/views/content_items/service_manual_topic.html.erb
index 7076093ed..f18cbd871 100644
--- a/app/views/content_items/service_manual_topic.html.erb
+++ b/app/views/content_items/service_manual_topic.html.erb
@@ -11,8 +11,10 @@
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <%= render "govuk_publishing_components/components/title", {
-        title: @content_item.title,
+      <%= render "govuk_publishing_components/components/heading", {
+        text: @content_item.title,
+        heading_level: 1,
+        font_size: "xl",
         margin_bottom: 7
       } %>
       <p class="govuk-body-l">
diff --git a/app/views/content_items/service_sign_in/_choose_sign_in.html.erb b/app/views/content_items/service_sign_in/_choose_sign_in.html.erb
index 34a051f2a..c68d53448 100644
--- a/app/views/content_items/service_sign_in/_choose_sign_in.html.erb
+++ b/app/views/content_items/service_sign_in/_choose_sign_in.html.erb
@@ -15,7 +15,12 @@
 <% end %>
 <%= form_tag({controller: 'content_items', action: 'service_sign_in_options'},
              method: "post") do %>
-  <% legend_text = render 'govuk_publishing_components/components/title', title: @content_item.title %>
+  <% legend_text = render 'govuk_publishing_components/components/heading', 
+    text: @content_item.title,
+    heading_level: 1,
+    font_size: "xl",
+    margin_bottom: 8
+  %>
   <% description_text = render 'govuk_publishing_components/components/govspeak' do %>
     <% raw(@content_item.description) %>
   <% end %>
diff --git a/app/views/content_items/service_sign_in/_create_new_account.html.erb b/app/views/content_items/service_sign_in/_create_new_account.html.erb
index b781641d8..efa846bbb 100644
--- a/app/views/content_items/service_sign_in/_create_new_account.html.erb
+++ b/app/views/content_items/service_sign_in/_create_new_account.html.erb
@@ -1,6 +1,11 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', title: @content_item.title %>
+    <%= render 'govuk_publishing_components/components/heading', 
+      text: @content_item.title,
+      heading_level: 1,
+      font_size: "xl",
+      margin_bottom: 8
+    %>
     <%= render 'govuk_publishing_components/components/govspeak', {} do %>
       <% raw(@content_item.body) %>
     <% end %>
diff --git a/app/views/content_items/specialist_document.html.erb b/app/views/content_items/specialist_document.html.erb
index 83cae722e..3abdb4f7f 100644
--- a/app/views/content_items/specialist_document.html.erb
+++ b/app/views/content_items/specialist_document.html.erb
@@ -9,7 +9,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds responsive-top-margin">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/content_items/speech.html.erb b/app/views/content_items/speech.html.erb
index 160ce52de..727eccffa 100644
--- a/app/views/content_items/speech.html.erb
+++ b/app/views/content_items/speech.html.erb
@@ -6,7 +6,7 @@
 
 <div class="govuk-grid-row gem-print-columns-none">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/content_items/statistical_data_set.html.erb b/app/views/content_items/statistical_data_set.html.erb
index a18564a9e..7a2255e27 100644
--- a/app/views/content_items/statistical_data_set.html.erb
+++ b/app/views/content_items/statistical_data_set.html.erb
@@ -6,10 +6,13 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title',
-               context: t("content_item.schema_name.#{@content_item.document_type}", count: 1),
-               title: @content_item.title,
-               average_title_length: "long" %>
+    <%= render 'govuk_publishing_components/components/heading',
+      context: t("content_item.schema_name.#{@content_item.document_type}", count: 1),
+      text: @content_item.title,
+      heading_level: 1,
+      font_size: "l",
+      margin_bottom: 8
+    %>
   </div>
   <%= render 'shared/translations', content_item: @content_item %>
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/content_items/statistics_announcement.html.erb b/app/views/content_items/statistics_announcement.html.erb
index 1c42bee98..0da33bb2f 100644
--- a/app/views/content_items/statistics_announcement.html.erb
+++ b/app/views/content_items/statistics_announcement.html.erb
@@ -6,7 +6,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
     <%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %>
   </div>
 </div>
diff --git a/app/views/content_items/working_group.html.erb b/app/views/content_items/working_group.html.erb
index 653a36637..d64263ffb 100644
--- a/app/views/content_items/working_group.html.erb
+++ b/app/views/content_items/working_group.html.erb
@@ -22,7 +22,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds responsive-top-margin">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/development/index.html.erb b/app/views/development/index.html.erb
index fbf72c25f..66a11d281 100644
--- a/app/views/development/index.html.erb
+++ b/app/views/development/index.html.erb
@@ -10,7 +10,12 @@
 <body>
   <div id="wrapper">
     <main class="govspeak" id="content">
-      <%= render 'govuk_publishing_components/components/title', title: 'government-frontend' %>
+      <%= render 'govuk_publishing_components/components/heading', 
+        text: 'government-frontend',
+        heading_level: 1,
+        font_size: "xl",
+        margin_bottom: 8
+      %>
 
       <% html = capture do %>
         <p>
diff --git a/app/views/histories/history.html.erb b/app/views/histories/history.html.erb
index b9f4146b4..ebe84e8f4 100644
--- a/app/views/histories/history.html.erb
+++ b/app/views/histories/history.html.erb
@@ -1,8 +1,11 @@
 <header class="govuk-width-container">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
-      <%= render "govuk_publishing_components/components/title", {
-        title: "History of the UK&nbsp;government".html_safe
+      <%= render "govuk_publishing_components/components/heading", {
+        text: "History of the UK&nbsp;government".html_safe,
+        heading_level: 1,
+        font_size: "xl",
+        margin_bottom: 8
       } %>
     </div>
     <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/shared/_title_and_translations.html.erb b/app/views/shared/_title_and_translations.html.erb
index 1632bfdfa..650fa4da8 100644
--- a/app/views/shared/_title_and_translations.html.erb
+++ b/app/views/shared/_title_and_translations.html.erb
@@ -1,6 +1,6 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
 </div>
diff --git a/test/integration/service_manual_service_standard_test.rb b/test/integration/service_manual_service_standard_test.rb
index 2bc1f4700..1625f38f9 100644
--- a/test/integration/service_manual_service_standard_test.rb
+++ b/test/integration/service_manual_service_standard_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 class ServiceManualServiceStandardTest < ActionDispatch::IntegrationTest
-  test "service standard page has a title, summary and intro" do
+  test "service standard page has a heading, summary and intro" do
     setup_and_visit_content_item("service_manual_service_standard",
                                  "title" => "Service Standard",
                                  "description" => "The Service Standard is a set of 14 criteria.",
@@ -9,7 +9,7 @@ class ServiceManualServiceStandardTest < ActionDispatch::IntegrationTest
                                    "body" => "All public facing transactional services must meet the standard.",
                                  })
 
-    assert page.has_css?(".gem-c-title__text", text: "Service Standard"), "No title found"
+    assert page.has_css?(".gem-c-heading__text", text: "Service Standard"), "No title found"
     assert page.has_css?(".app-page-header__summary", text: "The Service Standard is a set of 14 criteria"), "No description found"
     assert page.has_css?(".app-page-header__intro", text: "All public facing transactional services must meet the standard."), "No body found"
   end
diff --git a/test/presenters/corporate_information_page_presenter_test.rb b/test/presenters/corporate_information_page_presenter_test.rb
index 33c25766e..77574612c 100644
--- a/test/presenters/corporate_information_page_presenter_test.rb
+++ b/test/presenters/corporate_information_page_presenter_test.rb
@@ -28,11 +28,11 @@ def schema_name
       assert presented_item.is_a?(ContentItem::ContentsList)
     end
 
-    test "has title without context" do
-      assert presented_item.is_a?(ContentItem::TitleAndContext)
-      title_component_params = { title: "About us", context_locale: :en }
+    test "has heading without context" do
+      assert presented_item.is_a?(ContentItem::HeadingAndContext)
+      heading_component_params = { text: "About us", context_locale: :en, heading_level: 1, margin_bottom: 8, font_size: "xl" }
 
-      assert_equal title_component_params, presented_item.title_and_context
+      assert_equal heading_component_params, presented_item.heading_and_context
     end
 
     test "has organisation branding" do
diff --git a/test/presenters/detailed_guide_presenter_test.rb b/test/presenters/detailed_guide_presenter_test.rb
index 26d384318..238b6bca0 100644
--- a/test/presenters/detailed_guide_presenter_test.rb
+++ b/test/presenters/detailed_guide_presenter_test.rb
@@ -70,7 +70,7 @@ def schema_name
 
   test "context in title is overridden to display as guidance" do
     I18n.with_locale("fr") do
-      assert_equal I18n.t("content_item.schema_name.guidance", count: 1), presented_item.title_and_context[:context]
+      assert_equal I18n.t("content_item.schema_name.guidance", count: 1), presented_item.heading_and_context[:context]
     end
   end
 
diff --git a/test/presenters/field_of_operation_presenter_test.rb b/test/presenters/field_of_operation_presenter_test.rb
index 6146f5804..b594ebb93 100644
--- a/test/presenters/field_of_operation_presenter_test.rb
+++ b/test/presenters/field_of_operation_presenter_test.rb
@@ -5,13 +5,16 @@ def schema_name
     "field_of_operation"
   end
 
-  test "#title_and_context" do
-    expected_title_and_context = {
-      title: "Operations in Iraq",
+  test "#heading_and_context" do
+    expected_heading_and_context = {
+      text: "Operations in Iraq",
       context: "British fatalities",
       context_locale: :en,
+      heading_level: 1,
+      margin_bottom: 8,
+      font_size: "xl",
     }
-    assert_equal expected_title_and_context, presented_item.title_and_context
+    assert_equal expected_heading_and_context, presented_item.heading_and_context
   end
 
   test "it presents a description" do
@@ -29,7 +32,7 @@ def schema_name
     assert_equal expected, presented_item.organisation
   end
 
-  test "it presents fatlity notices when they are present" do
+  test "it presents fatality notices when they are present" do
     expected_notices = [
       FieldOfOperationPresenter::FatalityNotice.new("A fatality sadly occurred on 1 December", nil, "A fatality notice", "/government/fatalities/fatality-notice-one"),
       FieldOfOperationPresenter::FatalityNotice.new("A fatality sadly occurred on 2 December", nil, "A second fatality notice", "/government/fatalities/fatality-notice-two"),
@@ -38,7 +41,7 @@ def schema_name
     assert_equal expected_notices, presented_item.fatality_notices
   end
 
-  test "it presents an ampty array when no fatlity notices are present" do
+  test "it presents an empty array when no fatality notices are present" do
     without_fatalities = schema_item
     without_fatalities["links"].delete("fatality_notices")
 
diff --git a/test/presenters/fields_of_operation_presenter_test.rb b/test/presenters/fields_of_operation_presenter_test.rb
index e740ad1ef..4ea30c76a 100644
--- a/test/presenters/fields_of_operation_presenter_test.rb
+++ b/test/presenters/fields_of_operation_presenter_test.rb
@@ -5,14 +5,17 @@ def schema_name
     "fields_of_operation"
   end
 
-  test "presents the title and context" do
-    title_component_params = {
-      title: "Fields of operation",
+  test "presents the heading and context" do
+    heading_component_params = {
+      text: "Fields of operation",
       context: "British fatalities",
       context_locale: :en,
+      heading_level: 1,
+      margin_bottom: 8,
+      font_size: "xl",
     }
 
-    assert_equal title_component_params, presented_item.title_and_context
+    assert_equal heading_component_params, presented_item.heading_and_context
   end
 
   test "presents the fields of operation" do
diff --git a/test/presenters/specialist_document_presenter_test.rb b/test/presenters/specialist_document_presenter_test.rb
index 088723d40..aac3f0d25 100644
--- a/test/presenters/specialist_document_presenter_test.rb
+++ b/test/presenters/specialist_document_presenter_test.rb
@@ -91,16 +91,17 @@ class PresentedSpecialistDocument < SpecialistDocumentTestCase
       assert Time.zone.parse(presented.published) == Time.zone.parse("2002-02-02")
     end
 
-    test "has title without context" do
-      assert presented_item("aaib-reports").is_a?(ContentItem::TitleAndContext)
-      title_component_params = {
-        title: schema_item("aaib-reports")["title"],
+    test "has heading without context" do
+      assert presented_item("aaib-reports").is_a?(ContentItem::HeadingAndContext)
+      heading_component_params = {
+        text: schema_item("aaib-reports")["title"],
         context_locale: nil,
-        average_title_length: "long",
-
+        heading_level: 1,
+        margin_bottom: 8,
+        font_size: "l",
       }
 
-      assert_equal title_component_params, presented_item("aaib-reports").title_and_context
+      assert_equal heading_component_params, presented_item("aaib-reports").heading_and_context
     end
 
     test "should not present continuation_link" do

From 8323eabaada51637340e4f1d258a4fae39600104 Mon Sep 17 00:00:00 2001
From: James Chan <james.chan@digital.cabinet-office.gov.uk>
Date: Wed, 19 Feb 2025 12:24:36 +0000
Subject: [PATCH 2/3] Add 'govuk-main-wrapper' class on the main element to
 introduce spacing

This reinstates spacing that was introduced by the title component (and also the main element should have this class anyway). The class is excluded from html_publication, worldwide_corporate_information, worldwide_office, and worldwide_organisation templates as it introduces too much spacing. Additionally, using the 'govuk-main-wrapper' class makes the instances of 'responsive-top-margin' redundant as the latter now introduces excess spacing. Therefore they have been removed.
---
 app/presenters/content_item_presenter.rb                      | 4 ++++
 app/presenters/html_publication_presenter.rb                  | 4 ++++
 .../worldwide_corporate_information_page_presenter.rb         | 4 ++++
 app/presenters/worldwide_office_presenter.rb                  | 4 ++++
 app/presenters/worldwide_organisation_presenter.rb            | 4 ++++
 app/views/content_items/case_study.html.erb                   | 2 +-
 app/views/content_items/specialist_document.html.erb          | 2 +-
 app/views/content_items/working_group.html.erb                | 2 +-
 app/views/development/index.html.erb                          | 2 +-
 app/views/layouts/application.html.erb                        | 2 +-
 10 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/presenters/content_item_presenter.rb b/app/presenters/content_item_presenter.rb
index 848b58773..d49d547b3 100644
--- a/app/presenters/content_item_presenter.rb
+++ b/app/presenters/content_item_presenter.rb
@@ -118,6 +118,10 @@ def show_default_breadcrumbs?
     true
   end
 
+  def exclude_main_wrapper_class?
+    false
+  end
+
 private
 
   def voting_is_open?
diff --git a/app/presenters/html_publication_presenter.rb b/app/presenters/html_publication_presenter.rb
index 6bfebdbf6..c415749f5 100644
--- a/app/presenters/html_publication_presenter.rb
+++ b/app/presenters/html_publication_presenter.rb
@@ -48,6 +48,10 @@ def full_path(request)
     request.base_url + request.path
   end
 
+  def exclude_main_wrapper_class?
+    true
+  end
+
 private
 
   def public_timestamp
diff --git a/app/presenters/worldwide_corporate_information_page_presenter.rb b/app/presenters/worldwide_corporate_information_page_presenter.rb
index d305f5d84..698703e86 100644
--- a/app/presenters/worldwide_corporate_information_page_presenter.rb
+++ b/app/presenters/worldwide_corporate_information_page_presenter.rb
@@ -21,6 +21,10 @@ def sponsoring_organisations
     worldwide_organisation&.sponsoring_organisations
   end
 
+  def exclude_main_wrapper_class?
+    true
+  end
+
 private
 
   def show_contents_list?
diff --git a/app/presenters/worldwide_office_presenter.rb b/app/presenters/worldwide_office_presenter.rb
index d65d7fc63..d20cee512 100644
--- a/app/presenters/worldwide_office_presenter.rb
+++ b/app/presenters/worldwide_office_presenter.rb
@@ -30,6 +30,10 @@ def sponsoring_organisations
     worldwide_organisation&.sponsoring_organisations
   end
 
+  def exclude_main_wrapper_class?
+    true
+  end
+
 private
 
   def show_contents_list?
diff --git a/app/presenters/worldwide_organisation_presenter.rb b/app/presenters/worldwide_organisation_presenter.rb
index 667d7aea4..4a0214310 100644
--- a/app/presenters/worldwide_organisation_presenter.rb
+++ b/app/presenters/worldwide_organisation_presenter.rb
@@ -123,6 +123,10 @@ def sponsoring_organisations
     content_item.dig("links", "sponsoring_organisations") || []
   end
 
+  def exclude_main_wrapper_class?
+    true
+  end
+
 private
 
   def office(office, contact)
diff --git a/app/views/content_items/case_study.html.erb b/app/views/content_items/case_study.html.erb
index 52a7414e3..a1bb70ccc 100644
--- a/app/views/content_items/case_study.html.erb
+++ b/app/views/content_items/case_study.html.erb
@@ -5,7 +5,7 @@
 <% end %>
 
 <div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds responsive-top-margin">
+  <div class="govuk-grid-column-two-thirds">
     <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
diff --git a/app/views/content_items/specialist_document.html.erb b/app/views/content_items/specialist_document.html.erb
index 3abdb4f7f..25c95c0a4 100644
--- a/app/views/content_items/specialist_document.html.erb
+++ b/app/views/content_items/specialist_document.html.erb
@@ -8,7 +8,7 @@
 <% content_for :simple_header, true %>
 
 <div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds responsive-top-margin">
+  <div class="govuk-grid-column-two-thirds">
     <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
diff --git a/app/views/content_items/working_group.html.erb b/app/views/content_items/working_group.html.erb
index d64263ffb..b3800e66f 100644
--- a/app/views/content_items/working_group.html.erb
+++ b/app/views/content_items/working_group.html.erb
@@ -21,7 +21,7 @@
 <% end %>
 
 <div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds responsive-top-margin">
+  <div class="govuk-grid-column-two-thirds">
     <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
diff --git a/app/views/development/index.html.erb b/app/views/development/index.html.erb
index 66a11d281..77e7501a0 100644
--- a/app/views/development/index.html.erb
+++ b/app/views/development/index.html.erb
@@ -9,7 +9,7 @@
 </head>
 <body>
   <div id="wrapper">
-    <main class="govspeak" id="content">
+    <main class="govspeak govuk-main-wrapper" id="content">
       <%= render 'govuk_publishing_components/components/heading', 
         text: 'government-frontend',
         heading_level: 1,
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 4343e8c6e..82f4806ff 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -31,7 +31,7 @@
 
     <%= yield :header %>
 
-    <main role="main" id="content" class="<%= @content_item.schema_name.dasherize %>" lang="<%= I18n.locale %>">
+    <main role="main" id="content" class="<%= @content_item.schema_name.dasherize %> <%= 'govuk-main-wrapper' unless @content_item.exclude_main_wrapper_class? %>" lang="<%= I18n.locale %>">
       <span id="Top"></span>
       <%= yield :main %>
     </main>

From 6a2ff91ece0fbc28f958df26e3c5594fbd100af8 Mon Sep 17 00:00:00 2001
From: James Chan <james.chan@digital.cabinet-office.gov.uk>
Date: Wed, 19 Feb 2025 12:27:03 +0000
Subject: [PATCH 3/3] Remove margin top override for org logo

During testing, I noticed this margin top override was now introducing unnecessary spacing after implementing the 'govuk-main-wrapper' class in the previous commit, and therefore I've removed it.
---
 app/views/content_items/field_of_operation.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/content_items/field_of_operation.html.erb b/app/views/content_items/field_of_operation.html.erb
index 7df1de25a..aa2460118 100644
--- a/app/views/content_items/field_of_operation.html.erb
+++ b/app/views/content_items/field_of_operation.html.erb
@@ -3,7 +3,7 @@
     <div class="govuk-grid-column-two-thirds">
       <%= render "govuk_publishing_components/components/heading", @content_item.heading_and_context %>
     </div>
-    <div class="govuk-grid-column-one-third govuk-!-margin-top-8 govuk-!-margin-bottom-8">
+    <div class="govuk-grid-column-one-third govuk-!-margin-bottom-8">
       <%= render "govuk_publishing_components/components/organisation_logo", {
         organisation: @content_item.organisation
       } %>