From b6cffdbd2af0c72a0ac12e31120e771d9cba6ee5 Mon Sep 17 00:00:00 2001
From: Matt Hill <matt.hill@digital.cabinet-office.gov.uk>
Date: Sat, 13 Jan 2024 00:09:23 +0000
Subject: [PATCH 1/3] Link to the publishing components gem font-size spike
 branch

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index ae096d3ae..c0d79018d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem "govspeak"
 gem "govuk_ab_testing"
 gem "govuk_app_config"
 gem "govuk_personalisation"
-gem "govuk_publishing_components"
+gem "govuk_publishing_components", git: "https://github.com/alphagov/govuk_publishing_components.git", branch: "spike-font-size-changes-2"
 gem "htmlentities"
 gem "plek"
 gem "rails-controller-testing"

From 052368dc1df8e1fee656dac08d1dfcadae4aee2e Mon Sep 17 00:00:00 2001
From: Matt Hill <matt.hill@digital.cabinet-office.gov.uk>
Date: Mon, 12 Feb 2024 11:59:57 +0000
Subject: [PATCH 2/3] Bundle the font size spike from the gem

---
 Gemfile.lock | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 82b563240..3d71ba49a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,18 @@
+GIT
+  remote: https://github.com/alphagov/govuk_publishing_components.git
+  revision: 4b65e6cdbdbb78f85122c2d176a368c0b5411ff7
+  branch: spike-font-size-changes-2
+  specs:
+    govuk_publishing_components (37.3.0)
+      govuk_app_config
+      govuk_personalisation (>= 0.7.0)
+      kramdown
+      plek
+      rails (>= 6)
+      rouge
+      sprockets (>= 3)
+      sprockets-rails
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -169,15 +184,6 @@ GEM
     govuk_personalisation (0.15.0)
       plek (>= 1.9.0)
       rails (>= 6, < 8)
-    govuk_publishing_components (37.3.0)
-      govuk_app_config
-      govuk_personalisation (>= 0.7.0)
-      kramdown
-      plek
-      rails (>= 6)
-      rouge
-      sprockets (>= 3)
-      sprockets-rails
     govuk_schemas (4.7.0)
       json-schema (>= 2.8, < 4.2)
     govuk_test (4.0.2)
@@ -659,7 +665,7 @@ DEPENDENCIES
   govuk_ab_testing
   govuk_app_config
   govuk_personalisation
-  govuk_publishing_components
+  govuk_publishing_components!
   govuk_schemas
   govuk_test
   htmlentities

From 448a5537d15c08c03d3c7a4ae7fd05174779483a Mon Sep 17 00:00:00 2001
From: Jon Kirwan <87758239+jon-kirwan@users.noreply.github.com>
Date: Fri, 2 Feb 2024 12:17:20 +0000
Subject: [PATCH 3/3] Remove `govuk-font(14);`

---
 app/assets/stylesheets/components/_figure.scss            | 3 ---
 app/assets/stylesheets/views/_worldwide-organisation.scss | 1 -
 2 files changed, 4 deletions(-)

diff --git a/app/assets/stylesheets/components/_figure.scss b/app/assets/stylesheets/components/_figure.scss
index 7d11a5871..a27542091 100644
--- a/app/assets/stylesheets/components/_figure.scss
+++ b/app/assets/stylesheets/components/_figure.scss
@@ -24,11 +24,8 @@
   @include govuk-font(16);
 
   @include govuk-media-query($from: tablet) {
-    @include govuk-font(14);
-
     display: block;
     vertical-align: top;
-
     box-sizing: border-box;
     float: left;
     padding-left: govuk-spacing(3);
diff --git a/app/assets/stylesheets/views/_worldwide-organisation.scss b/app/assets/stylesheets/views/_worldwide-organisation.scss
index 932deedc6..b04481e02 100644
--- a/app/assets/stylesheets/views/_worldwide-organisation.scss
+++ b/app/assets/stylesheets/views/_worldwide-organisation.scss
@@ -6,7 +6,6 @@
 .js-enabled {
   .worldwide-organisation-header {
     .show-other-content {
-      @include govuk-font(14);
       margin-left: .3em;
       white-space: nowrap;
     }