From c606815112d6e2f7c3ec788449b1b579a6fe1602 Mon Sep 17 00:00:00 2001
From: Lee Mills <lee@leemills.dev>
Date: Mon, 10 Mar 2025 15:12:47 +0000
Subject: [PATCH 1/4] chore: drop compatibility layer now 10.3 is minimum
 support version

---
 localgov_base.theme | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/localgov_base.theme b/localgov_base.theme
index 63bcbafa..c817f3de 100644
--- a/localgov_base.theme
+++ b/localgov_base.theme
@@ -135,12 +135,7 @@ function localgov_base_preprocess_page(&$variables): void {
 
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = \Drupal::service('renderer');
-    $rendered = DeprecationHelper::backwardsCompatibleCall(
-      currentVersion: \Drupal::VERSION,
-      deprecatedVersion: '10.3',
-      currentCallable: fn() => $renderer->renderInIsolation($copy),
-      deprecatedCallable: fn() => $renderer->renderPlain($copy),
-    );
+    $rendered = $renderer->renderInIsolation($copy);
 
     $variables['has_' . $region] = strlen(trim(strip_tags($rendered, '<drupal-render-placeholder><embed><hr><iframe><img><input><link><object><script><source><style><video>'))) > 0;
   }

From 86a748aa8138224a2965f02a090f90dab56d14f0 Mon Sep 17 00:00:00 2001
From: Lee Mills <lee@leemills.dev>
Date: Mon, 10 Mar 2025 15:19:46 +0000
Subject: [PATCH 2/4] chore: drop compatibility layer now 10.3 is minimum
 support version

---
 localgov_base.theme | 1 -
 1 file changed, 1 deletion(-)

diff --git a/localgov_base.theme b/localgov_base.theme
index c817f3de..4dce2d7d 100644
--- a/localgov_base.theme
+++ b/localgov_base.theme
@@ -6,7 +6,6 @@
  */
 
 use Drupal\Component\Utility\Crypt;
-use Drupal\Component\Utility\DeprecationHelper;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\views\ViewExecutable;

From 946da00b7a3e9193d428a2c5c02ce84a393b9055 Mon Sep 17 00:00:00 2001
From: Mark Conroy <mark@mark.ie>
Date: Mon, 10 Mar 2025 15:39:54 +0000
Subject: [PATCH 3/4] Update subtheme generator to inherit base theme settings

---
 scripts/create_subtheme.sh                     | 18 +++++++++++++++---
 .../config/schema/_subtheme.schema.yml_        |  2 ++
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 scripts/subtheme-items/config/schema/_subtheme.schema.yml_

diff --git a/scripts/create_subtheme.sh b/scripts/create_subtheme.sh
index 77d89762..145a9861 100644
--- a/scripts/create_subtheme.sh
+++ b/scripts/create_subtheme.sh
@@ -55,26 +55,38 @@ echo "+ themes/custom/$LGD_SUB_THEME folder created"
 
 cd $LGD_SUB_THEME
 
+mkdir -p config/schema
+echo "+ themes/custom/$LGD_SUB_THEME/config/install folder created"
+
 cp ../../contrib/localgov_base/logo.svg .
 echo "+ themes/custom/$LGD_SUB_THEME/logo.svg copied"
 
 cp ../../contrib/localgov_base/scripts/subtheme-items/_subtheme.info.yml_ $LGD_SUB_THEME.info.yml
 echo "+ themes/custom/$LGD_SUB_THEME/$LGD_SUB_THEME.info.yml created"
+
 cp ../../contrib/localgov_base/scripts/subtheme-items/subtheme.libraries.yml $LGD_SUB_THEME.libraries.yml
 echo "+ themes/custom/$LGD_SUB_THEME/$LGD_SUB_THEME.libraries.yml created"
+
 cp ../../contrib/localgov_base/scripts/subtheme-items/subtheme.theme $LGD_SUB_THEME.theme
 echo "+ themes/custom/$LGD_SUB_THEME/$LGD_SUB_THEME.theme created"
+
+cp ../../contrib/localgov_base/scripts/subtheme-items/config/schema/_subtheme.schema.yml_ config/schema/$LGD_SUB_THEME.schema.yml
+echo "+ themes/custom/$LGD_SUB_THEME/config/schema/$LGD_SUB_THEME.schema.yml created"
+
 cp ../../contrib/localgov_base/scripts/subtheme-items/package.json package.json
 echo "+ themes/custom/$LGD_SUB_THEME/package.json created"
+
 cp ../../contrib/localgov_base/scripts/subtheme-items/.nvmrc .nvmrc
 echo "+ themes/custom/$LGD_SUB_THEME/.nvmrc created"
+
 cp ../../contrib/localgov_base/scripts/subtheme-items/.stylelintrc.json .stylelintrc.json
 echo "+ themes/custom/$LGD_SUB_THEME/.stylelintrc.json created"
+
 cp ../../contrib/localgov_base/scripts/subtheme-items/_.eslintrc.json_ .eslintrc.json
 echo "+ themes/custom/$LGD_SUB_THEME/.eslintrc.json created"
 
-perl -i -pe "s/LGD_SUB_THEME_NAME/$LGD_SUB_THEME_NAME/g" *
-perl -i -pe "s/LGD_SUB_THEME/$LGD_SUB_THEME/g" *
+find . -type f -exec perl -i -pe "s/LGD_SUB_THEME_NAME/$LGD_SUB_THEME_NAME/g" {} +
+find . -type f -exec perl -i -pe "s/LGD_SUB_THEME/$LGD_SUB_THEME/g" {} +
 echo "+ variables replaced"
 
 cp -r ../../contrib/localgov_base/scripts/subtheme-items/.gitignore .
@@ -95,4 +107,4 @@ echo "+ added default favicons - you will probably want to create new ones for y
 echo ""
 echo "# Your new localgov_base sub-theme has been created."
 echo "# Check the themes/custom folder to access the theme files."
-echo "# Install your sub-theme using drush or from the Drupal Appearance menu"
+echo "# Install your sub-theme using drush - drush then $LGD_SUB_THEME - or from the Drupal Appearance menu"
diff --git a/scripts/subtheme-items/config/schema/_subtheme.schema.yml_ b/scripts/subtheme-items/config/schema/_subtheme.schema.yml_
new file mode 100644
index 00000000..f9079bc0
--- /dev/null
+++ b/scripts/subtheme-items/config/schema/_subtheme.schema.yml_
@@ -0,0 +1,2 @@
+LGD_SUB_THEME.settings:
+  type: localgov_base.settings

From 9fcfe1f9246cab5c2816b215ecd923a6d28fb486 Mon Sep 17 00:00:00 2001
From: Mark Conroy <mark@mark.ie>
Date: Tue, 11 Mar 2025 12:47:22 +0000
Subject: [PATCH 4/4] Don't show guide title if stacked heading is used (#721)

* Revert "adds checkmark icon"

This reverts commit e5ef66b2ad4449a63ca2da4c5d93407082a717d4.

* adds checkbox icon

* Remove guide title if stacked heading is used

* typo

---------

Co-authored-by: Finn Lewis <finn@opencode.uk>
Co-authored-by: Stephen Cox <stephen-cox@users.noreply.github.com>
Co-authored-by: Andy Broomfield <andybroomfield@gmail.com>
Co-authored-by: Adnan <50206849+Adnan-cds@users.noreply.github.com>
---
 localgov_base.theme                                         | 6 ++++++
 .../content/node--localgov-guides-page--full.html.twig      | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/localgov_base.theme b/localgov_base.theme
index 4dce2d7d..2e94ef46 100644
--- a/localgov_base.theme
+++ b/localgov_base.theme
@@ -200,6 +200,12 @@ function localgov_base_preprocess_node(&$variables): void {
       $variables['label'] = t('[Draft]') . " " . $variables['node']->label();
     }
   }
+
+  if ($variables['node']->getType() === 'localgov_guides_page') {
+    if (theme_get_setting('localgov_base_localgov_guides_stacked_heading') === TRUE) {
+      $variables['stacked_heading'] = TRUE;
+    }
+  }
 }
 
 /**
diff --git a/templates/content/node--localgov-guides-page--full.html.twig b/templates/content/node--localgov-guides-page--full.html.twig
index bc9fea47..27de314a 100644
--- a/templates/content/node--localgov-guides-page--full.html.twig
+++ b/templates/content/node--localgov-guides-page--full.html.twig
@@ -22,9 +22,13 @@
 <article{{ attributes.addClass(classes).removeAttribute('role') }}>
   <div class="lgd-container padding-horizontal">
     {{ title_prefix }}
+      {% if stacked_heading %}
+        <div id="lgd-guides__title"></div>
+        {% else %}
       <h2{{ title_attributes.addClass('lgd-guides__title').setAttribute('id', 'lgd-guides__title') }}>
         {{ node.label }}
       </h2>
+      {% endif %}
     {{ title_suffix }}
 
     {% if content %}