defra_ruby_template 5.11.1 → 6.4.0

data/node_modules/govuk-frontend/dist/govuk/macros/logo.njk

@@ -1,4 +1,4 @@
-{#- This macro is for interal use within GOV.UK Frontend. It isn't intended for
+{#- This macro is for internal use within GOV.UK Frontend. It isn't intended for
 external use and may receive undocumented breaking changes in non-breaking
 releases of Frontend. #}
 
@@ -6,19 +6,12 @@ releases of Frontend. #}
 
 {% macro govukLogo(params) %}
   {#- Default options #}
-  {%- set rebrand = params.rebrand | default(false) %}
   {%- set useLogotype = params.useLogotype | default(true) %}
-  {%- set useTudorCrown = params.useTudorCrown | default(true) %}
-
-  {# Force use of Tudor Crown if rebrand flag is on. #}
-  {%- set useTudorCrown = true if rebrand else useTudorCrown  %}
 
   {#- Calculate how wide the logo needs to be for the given parameters. #}
-  {%- set svgWidth = 32 if useTudorCrown else 36 %}
-  {%- set svgWidth = svgWidth + 116 if (useLogotype and not rebrand) else svgWidth %}
-  {%- set svgWidth = svgWidth + 130 if (useLogotype and rebrand) else svgWidth %}
+  {%- set svgWidth = 32 %}
+  {%- set svgWidth = svgWidth + 130 if useLogotype else svgWidth %}
 
-  {#- Charles III's Tudor Crown icon has been the default since February 2024. #}
   {%- set _tudorCrown %}
     <g>
       <circle cx="20" cy="17.6" r="3.7"/>
@@ -33,24 +26,9 @@ releases of Frontend. #}
     </g>
   {%- endset %}
 
-  {#- St. Edward's Crown was the logo under Elizabeth II. It's included to avoid
-  a breaking change in services. It can be removed in Frontend v6. #}
-  {%- set _stEdwardsCrown %}
-    <path d="M13.4,22.3c2,.8,4.2-.2,5-2s-.2-4.2-2-5c-2-.8-4.2.2-5,2-.8,2,0,4.2,2,5M4.8,27.3c2,.8,4.2-.2,5-2s-.2-4.2-2-5c-2-.8-4.2.2-5,2-1,2,0,4.2,2,5M2.2,36.9c2,.8,4.2-.2,5-2,.8-2-.2-4.2-2-5-2-.8-4.2.2-5,2-.8,2,0,4.2,2,5M23,25.3c2,.8,4.2-.2,5-2s-.2-4.2-2-5c-2-.8-4.2.2-5,2s0,4.2,2,5M57.8,22.3c-2,.8-4.2-.2-5-2s.2-4.2,2-5c2-.8,4.2.2,5,2,1,2,0,4.2-2,5M66.4,27.3c-2,.8-4.2-.2-5-2s.2-4.2,2-5c2-.8,4.2.2,5,2,1,2,0,4.2-2,5M69,36.9c-2,.8-4.2-.2-5-2-.8-2,.2-4.2,2-5,2-.8,4.2.2,5,2,.8,2,0,4.2-2,5M48.2,25.3c-2,.8-4.2-.2-5-2s.2-4.2,2-5c2-.8,4.2.2,5,2s0,4.2-2,5M37.6,15.5l4.8,2.6v-7.2l-4.8,1.6c-.2-.2-.2-.4-.4-.4s2-6,2-6h-6.8l2,6c-.2.2-.4.2-.4.4-.2.2-4.8-1.4-4.8-1.4v7l4.8-2.6c-.2.2,0,.4.2.6l-2.8,8.4c-.2.4-.2.8-.2,1.4,0,2.2,1.6,4.2,3.8,4.4h1.2c2.2-.4,3.8-2.2,3.8-4.4s0-.8-.2-1.4l-2.8-8.4c.4-.2.6-.4.6-.6M35.6,56.1c9.2,0,17.8.6,25.6,1.8,2.2-9.2,4.8-14.4,7.6-18.2l-5.2-1.8c.6,2.6.6,3.8,0,5.6-.8-.8-1.6-2.4-2.2-4.8l-2.4,8.4c1.6-1,2.8-1.8,4-1.8-2.4,5.2-5.4,6.4-7.2,6-2.4-.4-3.4-2.6-3-4.4.6-2.6,3.2-3.2,4.4-.2,2.4-4.8-1.6-6.2-4.2-4.8,3.8-3.8,4.4-7.2,1.2-11.4-4.4,3.4-4.4,6.6-2.4,11.2-2.6-3-6.6-1.4-5,3.4,1.8-2.8,4.2-1,4,1.6-.4,2.4-3.4,4.2-7.4,4-5.6-.4-6-4.4-6-7.4,1.4-.2,3.8,1,6,4l.8-8.8c-2.2,2.4-4.4,2.8-6.6,2.8.8-2.4,4.2-6.2,4.2-6.2h-11s3.6,4,4.2,6.2c-2.2,0-4.4-.6-6.6-2.8l.8,8.8c2.2-3,4.6-4.2,6-4-.2,3.2-.4,7-6,7.4-3.8.4-7-1.6-7.4-4-.4-2.6,2-4.4,3.8-1.6,1.4-4.8-2.6-6.2-5.2-3.4,2-4.6,2-8-2.4-11.2-3.2,4.2-2.6,7.6,1.2,11.4-2.6-1.4-6.4,0-4.2,4.8,1.2-3,3.8-2.2,4.4.2.4,1.8-.8,3.8-3,4.4-2,.4-5-1-7.4-6,1.4,0,2.6.8,4,1.8l-3-8.4c-.6,2.4-1.4,3.8-2.4,4.8-.6-1.6-.4-3,0-5.6l-5.2,1.8c3,3.8,5.6,9,7.8,18.2,7.6-1,16.4-1.8,25.4-1.8"/>
-  {%- endset %}
-
-  {#- The GOV.UK logotype with standard dot. This needs to be slightly offset if
-  using the St. Edward's Crown, as that crown is wider. #}
   {%- set _logotype %}
-    <path {%- if not useTudorCrown %} transform="translate(8 0)"{% endif %} d="M88.6,33.2c0,1.8.2,3.4.6,5s1.2,3,2,4.4c1,1.2,2,2.2,3.4,3s3,1.2,5,1.2,3.4-.2,4.6-.8,2.2-1.4,3-2.2,1.2-1.8,1.6-3c.2-1,.4-2,.4-3v-.4h-10.6v-6.4h18.8v23h-7.4v-5c-.6.8-1.2,1.6-2,2.2-.8.6-1.6,1.2-2.6,1.8-1,.4-2,.8-3.2,1.2s-2.4.4-3.6.4c-3,0-5.8-.6-8-1.6-2.4-1.2-4.4-2.6-6-4.6s-2.8-4.2-3.6-6.8c-.6-2.8-1-5.6-1-8.6s.4-5.8,1.4-8.4,2.2-4.8,4-6.8,3.8-3.4,6.2-4.6c2.4-1.2,5.2-1.6,8.2-1.6s3.8.2,5.6.6c1.8.4,3.4,1.2,4.8,2s2.8,1.8,3.8,3c1.2,1.2,2,2.6,2.8,4l-7.4,4.2c-.4-.8-1-1.8-1.6-2.4-.6-.8-1.2-1.4-2-2s-1.6-1-2.6-1.4-2.2-.4-3.4-.4c-2,0-3.6.4-5,1.2-1.4.8-2.6,1.8-3.4,3-1,1.2-1.6,2.8-2,4.4-.6,1.6-.8,3.8-.8,5.4ZM161.4,24.6c-.8-2.6-2.2-4.8-4-6.8s-3.8-3.4-6.2-4.6c-2.4-1.2-5.2-1.6-8.4-1.6s-5.8.6-8.4,1.6c-2.2,1.2-4.4,2.8-6,4.6-1.8,2-3,4.2-4,6.8-.8,2.6-1.4,5.4-1.4,8.4s.4,5.8,1.4,8.4c.8,2.6,2.2,4.8,4,6.8s3.8,3.4,6.2,4.6c2.4,1.2,5.2,1.6,8.4,1.6s5.8-.6,8.4-1.6c2.4-1.2,4.6-2.6,6.2-4.6,1.8-2,3-4.2,4-6.8.8-2.6,1.4-5.4,1.4-8.4-.2-3-.6-5.8-1.6-8.4h0ZM154,33.2c0,2-.2,3.8-.8,5.4-.4,1.6-1.2,3.2-2.2,4.4s-2.2,2.2-3.4,2.8c-1.4.6-3,1-4.8,1s-3.4-.4-4.8-1-2.6-1.6-3.4-2.8c-1-1.2-1.6-2.6-2.2-4.4-.4-1.6-.8-3.4-.8-5.4v-.2c0-2,.2-3.8.8-5.4.4-1.6,1.2-3.2,2.2-4.4,1-1.2,2.2-2.2,3.4-2.8,1.4-.6,3-1,4.8-1s3.4.4,4.8,1,2.6,1.6,3.4,2.8c1,1.2,1.6,2.6,2.2,4.4.4,1.6.8,3.4.8,5.4v.2ZM177.8,54l-11.8-42h9.4l8,31.4h.2l8-31.4h9.4l-11.8,42h-11.4,0ZM235.4,46.7c1.2,0,2.4-.2,3.4-.6,1-.4,2-.8,2.8-1.6s1.4-1.6,1.8-2.8c.4-1.2.6-2.4.6-4V11.8h8.2v27.2c0,2.4-.4,4.4-1.2,6.2s-2,3.4-3.6,4.8c-1.4,1.4-3.2,2.4-5.4,3-2,.8-4.4,1-6.8,1s-4.8-.4-6.8-1c-2-.8-3.8-1.8-5.4-3-1.6-1.4-2.6-3-3.6-4.8-.8-1.8-1.2-4-1.2-6.2V11.7h8.4v26c0,1.6.2,2.8.6,4,.4,1.2,1,2,1.8,2.8s1.6,1.2,2.8,1.6c1.2.4,2.2.6,3.6.6h0ZM261.4,11.9h8.4v18.2l14.8-18.2h10.4l-14.4,16.8,15.4,25.2h-9.8l-11-18.8-5.4,6v12.8h-8.4V11.9h0ZM206.2,44.2c-3,0-5.4,2.4-5.4,5.4s2.4,5.4,5.4,5.4,5.4-2.4,5.4-5.4-2.4-5.4-5.4-5.4Z"/>
-  {%- endset %}
-
-  {#- The GOV.UK logotype with raised and coloured dot. This is only intended for
-  use alongide the Tudor Crown, so don't bother with offsetting for the
-  St. Edward's Crown. #}
-  {%- set _dotLogotype %}
-    <circle class="govuk-logo-dot" cx="227" cy="36" r="7.3"/>
-    <path d="M94.7,36.1c0,1.9.2,3.6.7,5.4.5,1.7,1.2,3.2,2.1,4.5.9,1.3,2.2,2.4,3.6,3.2,1.5.8,3.2,1.2,5.3,1.2s3.6-.3,4.9-.9c1.3-.6,2.3-1.4,3.1-2.3.8-.9,1.3-2,1.6-3,.3-1.1.5-2.1.5-3v-.4h-11v-6.6h19.5v24h-7.7v-5.4c-.5.8-1.2,1.6-2,2.3-.8.7-1.7,1.3-2.7,1.8-1,.5-2.1.9-3.3,1.2-1.2.3-2.5.4-3.8.4-3.2,0-6-.6-8.4-1.7-2.5-1.1-4.5-2.7-6.2-4.7-1.7-2-3-4.4-3.8-7.1-.9-2.7-1.3-5.6-1.3-8.7s.5-6,1.5-8.7,2.4-5.1,4.2-7.1c1.8-2,4-3.6,6.5-4.7s5.4-1.7,8.6-1.7,4,.2,5.9.7c1.8.5,3.5,1.1,5.1,2,1.5.9,2.9,1.9,4,3.2,1.2,1.2,2.1,2.6,2.8,4.1l-7.7,4.3c-.5-.9-1-1.8-1.6-2.6-.6-.8-1.3-1.5-2.2-2.1-.8-.6-1.7-1-2.8-1.4-1-.3-2.2-.5-3.5-.5-2,0-3.8.4-5.3,1.2s-2.7,1.9-3.6,3.2c-.9,1.3-1.7,2.8-2.1,4.6s-.7,3.5-.7,5.3v.3h0ZM152.9,13.7c3.2,0,6.1.6,8.7,1.7,2.6,1.2,4.7,2.7,6.5,4.7,1.8,2,3.1,4.4,4.1,7.1s1.4,5.6,1.4,8.7-.5,6-1.4,8.7c-.9,2.7-2.3,5.1-4.1,7.1s-4,3.6-6.5,4.7c-2.6,1.1-5.5,1.7-8.7,1.7s-6.1-.6-8.7-1.7c-2.6-1.1-4.7-2.7-6.5-4.7-1.8-2-3.1-4.4-4.1-7.1-.9-2.7-1.4-5.6-1.4-8.7s.5-6,1.4-8.7,2.3-5.1,4.1-7.1c1.8-2,4-3.6,6.5-4.7s5.4-1.7,8.7-1.7h0ZM152.9,50.4c1.9,0,3.6-.4,5-1.1,1.4-.7,2.7-1.7,3.6-3,1-1.3,1.7-2.8,2.2-4.5.5-1.7.8-3.6.8-5.7v-.2c0-2-.3-3.9-.8-5.7-.5-1.7-1.3-3.3-2.2-4.5-1-1.3-2.2-2.3-3.6-3-1.4-.7-3.1-1.1-5-1.1s-3.6.4-5,1.1c-1.5.7-2.7,1.7-3.6,3s-1.7,2.8-2.2,4.5c-.5,1.7-.8,3.6-.8,5.7v.2c0,2.1.3,4,.8,5.7.5,1.7,1.2,3.2,2.2,4.5,1,1.3,2.2,2.3,3.6,3,1.5.7,3.1,1.1,5,1.1ZM189.1,58l-12.3-44h9.8l8.4,32.9h.3l8.2-32.9h9.7l-12.3,44M262.9,50.4c1.3,0,2.5-.2,3.6-.6,1.1-.4,2-.9,2.8-1.7.8-.8,1.4-1.7,1.9-2.9.5-1.2.7-2.5.7-4.1V14h8.6v28.5c0,2.4-.4,4.6-1.3,6.6-.9,2-2.1,3.6-3.7,5-1.6,1.4-3.4,2.4-5.6,3.2-2.2.7-4.5,1.1-7.1,1.1s-4.9-.4-7.1-1.1c-2.2-.7-4-1.8-5.6-3.2s-2.8-3-3.7-5c-.9-2-1.3-4.1-1.3-6.6V14h8.7v27.2c0,1.6.2,2.9.7,4.1.5,1.2,1.1,2.1,1.9,2.9.8.8,1.7,1.3,2.8,1.7s2.3.6,3.6.6h0ZM288.5,14h8.7v19.1l15.5-19.1h10.8l-15.1,17.6,16.1,26.4h-10.2l-11.5-19.7-5.6,6.3v13.5h-8.7"/>
+    <circle class="govuk-logo-dot" cx="226" cy="36" r="7.3"/>
+    <path d="M93.94 41.25c.4 1.81 1.2 3.21 2.21 4.62 1 1.4 2.21 2.41 3.61 3.21s3.21 1.2 5.22 1.2 3.61-.4 4.82-1c1.4-.6 2.41-1.4 3.21-2.41.8-1 1.4-2.01 1.61-3.01s.4-2.01.4-3.01v.14h-10.86v-7.02h20.07v24.08h-8.03v-5.56c-.6.8-1.38 1.61-2.19 2.41-.8.8-1.81 1.2-2.81 1.81-1 .4-2.21.8-3.41 1.2s-2.41.4-3.81.4a18.56 18.56 0 0 1-14.65-6.63c-1.6-2.01-3.01-4.41-3.81-7.02s-1.4-5.62-1.4-8.83.4-6.02 1.4-8.83a20.45 20.45 0 0 1 19.46-13.65c3.21 0 4.01.2 5.82.8 1.81.4 3.61 1.2 5.02 2.01 1.61.8 2.81 2.01 4.01 3.21s2.21 2.61 2.81 4.21l-7.63 4.41c-.4-1-1-1.81-1.61-2.61-.6-.8-1.4-1.4-2.21-2.01-.8-.6-1.81-1-2.81-1.4-1-.4-2.21-.4-3.61-.4-2.01 0-3.81.4-5.22 1.2-1.4.8-2.61 1.81-3.61 3.21s-1.61 2.81-2.21 4.62c-.4 1.81-.6 3.71-.6 5.42s.8 5.22.8 5.22Zm57.8-27.9c3.21 0 6.22.6 8.63 1.81 2.41 1.2 4.82 2.81 6.62 4.82S170.2 24.39 171 27s1.4 5.62 1.4 8.83-.4 6.02-1.4 8.83-2.41 5.02-4.01 7.02-4.01 3.61-6.62 4.82-5.42 1.81-8.63 1.81-6.22-.6-8.63-1.81-4.82-2.81-6.42-4.82-3.21-4.41-4.01-7.02-1.4-5.62-1.4-8.83.4-6.02 1.4-8.83 2.41-5.02 4.01-7.02 4.01-3.61 6.42-4.82 5.42-1.81 8.63-1.81Zm0 36.73c1.81 0 3.61-.4 5.02-1s2.61-1.81 3.61-3.01 1.81-2.81 2.21-4.41c.4-1.81.8-3.61.8-5.62 0-2.21-.2-4.21-.8-6.02s-1.2-3.21-2.21-4.62c-1-1.2-2.21-2.21-3.61-3.01s-3.21-1-5.02-1-3.61.4-5.02 1c-1.4.8-2.61 1.81-3.61 3.01s-1.81 2.81-2.21 4.62c-.4 1.81-.8 3.61-.8 5.62 0 2.41.2 4.21.8 6.02.4 1.81 1.2 3.21 2.21 4.41s2.21 2.21 3.61 3.01c1.4.8 3.21 1 5.02 1Zm36.32 7.96-12.24-44.15h9.83l8.43 32.77h.4l8.23-32.77h9.83L200.3 58.04h-12.24Zm74.14-7.96c2.18 0 3.51-.6 3.51-.6 1.2-.6 2.01-1 2.81-1.81s1.4-1.81 1.81-2.81a13 13 0 0 0 .8-4.01V13.9h8.63v28.15c0 2.41-.4 4.62-1.4 6.62-.8 2.01-2.21 3.61-3.61 5.02s-3.41 2.41-5.62 3.21-4.62 1.2-7.02 1.2-5.02-.4-7.02-1.2c-2.21-.8-4.01-1.81-5.62-3.21s-2.81-3.01-3.61-5.02-1.4-4.21-1.4-6.62V13.9h8.63v26.95c0 1.61.2 3.01.8 4.01.4 1.2 1.2 2.21 2.01 2.81.8.8 1.81 1.4 2.81 1.81 0 0 1.34.6 3.51.6Zm34.22-36.18v18.92l15.65-18.92h10.82l-15.03 17.32 16.03 26.83h-10.21l-11.44-20.21-5.62 6.22v13.99h-8.83V13.9"/>
   {%- endset %}
 
   {#- The SVG needs `focusable="false"` so that Internet Explorer does not treat
@@ -70,9 +48,9 @@ releases of Frontend. #}
     {{- govukAttributes(params.attributes) }}
   >
     {%- if params.ariaLabelText %}<title>{{ params.ariaLabelText }}</title>{% endif %}
-    {{ (_stEdwardsCrown if not useTudorCrown else _tudorCrown) | safe | trim | indent(2) }}
+    {{ _tudorCrown | safe | trim | indent(2) }}
     {% if useLogotype %}
-      {{ (_dotLogotype if rebrand else _logotype) | safe | trim | indent(2) }}
+      {{ _logotype | safe | trim | indent(2) }}
     {% endif %}
   </svg>
 {% endmacro %}

data/node_modules/govuk-frontend/dist/govuk/objects/_button-group.import.scss

@@ -0,0 +1,8 @@
+@use "button-group.mixin" as button-group;
+
+@import "../base";
+
+@include govuk-exports("govuk/objects/button-group") {
+  @include button-group.styles;
+}
+

data/node_modules/govuk-frontend/dist/govuk/objects/_button-group.mixin.scss

@@ -0,0 +1,80 @@
+@use "../base";
+
+/// @access private
+@mixin styles {
+  // Button groups can be used to group buttons and links together as a group.
+  //
+  // Within a button group:
+  //
+  // - links are styled to line up visually with the buttons, including being
+  //   centre-aligned on mobile
+  // - spacing between the buttons and links is handled automatically, including
+  //   when they wrap across multiple lines
+  .govuk-button-group {
+    $horizontal-gap: base.govuk-spacing(3);
+    $vertical-gap: base.govuk-spacing(3);
+
+    // These need to be kept in sync with the button component's styles
+    $button-padding: base.govuk-spacing(2);
+    $button-shadow-size: base.$govuk-border-width-form-element;
+
+    $link-spacing: base.govuk-spacing(1);
+
+    @include base.govuk-responsive-margin(6, "bottom", $adjustment: $vertical-gap * -1);
+
+    // Flexbox is used to center-align links on mobile, align everything along
+    // the baseline on tablet and above, and to removes extra whitespace that
+    // we'd get between the buttons and links because they're inline-blocks.
+    //
+    // Ideally we'd use `gap` with flexbox rather than having to do it all with
+    // margins, but unfortunately the support isn't there (yet) and @supports
+    // doesn't play nicely with it
+    // (https://github.com/w3c/csswg-drafts/issues/3559)
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    // Give links within the button group the same font-size and line-height
+    // as buttons.
+    //
+    // Because we want the focus state to be tight around the link text, we use
+    // margins where the buttons would use padding.
+    .govuk-link {
+      @include base.govuk-font($size: 19, $line-height: 19px);
+      display: inline-block;
+      // Prevent links overflowing their container in IE10/11 because of bug
+      // with align-items: center
+      max-width: 100%;
+      margin-top: $link-spacing;
+      margin-bottom: $link-spacing + $vertical-gap;
+      text-align: center;
+    }
+
+    // Reduce the bottom margin to the size of the vertical gap (accommodating
+    // the button shadow) – the 'lost' margin is moved to the button-group.
+    .govuk-button {
+      margin-bottom: $vertical-gap + $button-shadow-size;
+    }
+
+    // On tablet and above, we also introduce a 'column gap' between the
+    // buttons and links in each row and left align links
+    @media #{base.govuk-from-breakpoint(tablet)} {
+      flex-direction: row;
+      flex-wrap: wrap;
+      align-items: baseline;
+
+      // Cancel out the column gap for the last item in each row
+      margin-right: ($horizontal-gap * -1);
+
+      .govuk-button,
+      .govuk-link {
+        margin-right: $horizontal-gap;
+      }
+
+      .govuk-link {
+        text-align: left;
+      }
+    }
+  }
+}
+

data/node_modules/govuk-frontend/dist/govuk/objects/_button-group.scss

@@ -1,80 +1,5 @@
-@import "../base";
+@use "button-group.mixin" as button-group;
+@use "../custom-properties";
 
-@include govuk-exports("govuk/objects/button-group") {
-  // Button groups can be used to group buttons and links together as a group.
-  //
-  // Within a button group:
-  //
-  // - links are styled to line up visually with the buttons, including being
-  //   centre-aligned on mobile
-  // - spacing between the buttons and links is handled automatically, including
-  //   when they wrap across multiple lines
-  .govuk-button-group {
-    $horizontal-gap: govuk-spacing(3);
-    $vertical-gap: govuk-spacing(3);
+@include button-group.styles;
 
-    // These need to be kept in sync with the button component's styles
-    $button-padding: govuk-spacing(2);
-    $button-shadow-size: $govuk-border-width-form-element;
-
-    $link-spacing: govuk-spacing(1);
-
-    @include govuk-responsive-margin(6, "bottom", $adjustment: $vertical-gap * -1);
-
-    // Flexbox is used to center-align links on mobile, align everything along
-    // the baseline on tablet and above, and to removes extra whitespace that
-    // we'd get between the buttons and links because they're inline-blocks.
-    //
-    // Ideally we'd use `gap` with flexbox rather than having to do it all with
-    // margins, but unfortunately the support isn't there (yet) and @supports
-    // doesn't play nicely with it
-    // (https://github.com/w3c/csswg-drafts/issues/3559)
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    // Give links within the button group the same font-size and line-height
-    // as buttons.
-    //
-    // Because we want the focus state to be tight around the link text, we use
-    // margins where the buttons would use padding.
-    .govuk-link {
-      @include govuk-font($size: 19, $line-height: 19px);
-      display: inline-block;
-      // Prevent links overflowing their container in IE10/11 because of bug
-      // with align-items: center
-      max-width: 100%;
-      margin-top: $link-spacing;
-      margin-bottom: $link-spacing + $vertical-gap;
-      text-align: center;
-    }
-
-    // Reduce the bottom margin to the size of the vertical gap (accommodating
-    // the button shadow) – the 'lost' margin is moved to the button-group.
-    .govuk-button {
-      margin-bottom: $vertical-gap + $button-shadow-size;
-    }
-
-    // On tablet and above, we also introduce a 'column gap' between the
-    // buttons and links in each row and left align links
-    @include govuk-media-query($from: tablet) {
-      // Cancel out the column gap for the last item in each row
-      margin-right: ($horizontal-gap * -1);
-
-      flex-direction: row;
-      flex-wrap: wrap;
-      align-items: baseline;
-
-      .govuk-button,
-      .govuk-link {
-        margin-right: $horizontal-gap;
-      }
-
-      .govuk-link {
-        text-align: left;
-      }
-    }
-  }
-}
-
-/*# sourceMappingURL=_button-group.scss.map */

data/node_modules/govuk-frontend/dist/govuk/objects/_form-group.import.scss

@@ -0,0 +1,8 @@
+@use "form-group.mixin" as form-group;
+
+@import "../base";
+
+@include govuk-exports("govuk/objects/form-group") {
+  @include form-group.styles;
+}
+

data/node_modules/govuk-frontend/dist/govuk/objects/_form-group.mixin.scss

@@ -0,0 +1,26 @@
+@use "../base";
+
+/// @access private
+@mixin styles {
+  .govuk-form-group {
+    @include base.govuk-clearfix;
+    @include base.govuk-responsive-margin(6, "bottom");
+
+    .govuk-form-group:last-of-type {
+      margin-bottom: 0; // Remove margin from last item in nested groups
+    }
+  }
+
+  .govuk-form-group--error {
+    padding-left: base.govuk-spacing(3);
+    border-left: base.$govuk-border-width-form-group-error solid;
+    border-left-color: base.govuk-functional-colour(error);
+
+    .govuk-form-group {
+      // Reset error styles in nested form groups that might have error class
+      padding: 0;
+      border: 0;
+    }
+  }
+}
+

data/node_modules/govuk-frontend/dist/govuk/objects/_form-group.scss

@@ -1,25 +1,5 @@
-@import "../base";
+@use "form-group.mixin" as form-group;
+@use "../custom-properties";
 
-@include govuk-exports("govuk/objects/form-group") {
-  .govuk-form-group {
-    @include govuk-clearfix;
-    @include govuk-responsive-margin(6, "bottom");
+@include form-group.styles;
 
-    .govuk-form-group:last-of-type {
-      margin-bottom: 0; // Remove margin from last item in nested groups
-    }
-  }
-
-  .govuk-form-group--error {
-    padding-left: govuk-spacing(3);
-    border-left: $govuk-border-width-form-group-error solid $govuk-error-colour;
-
-    .govuk-form-group {
-      // Reset error styles in nested form groups that might have error class
-      padding: 0;
-      border: 0;
-    }
-  }
-}
-
-/*# sourceMappingURL=_form-group.scss.map */

data/node_modules/govuk-frontend/dist/govuk/objects/_grid.import.scss

@@ -0,0 +1,8 @@
+@use "grid.mixin" as grid;
+
+@import "../base";
+
+@include govuk-exports("govuk/objects/grid") {
+  @include grid.styles;
+}
+

data/node_modules/govuk-frontend/dist/govuk/objects/_grid.mixin.scss

@@ -0,0 +1,28 @@
+@use "sass:map";
+
+@use "../base";
+
+/// @access private
+@mixin styles {
+  .govuk-grid-row {
+    @include base.govuk-clearfix;
+    margin-right: -(base.$govuk-gutter-half);
+    margin-left: -(base.$govuk-gutter-half);
+  }
+
+  @each $width in map.keys(base.$govuk-grid-widths) {
+    .govuk-grid-column-#{$width} {
+      @include base.govuk-grid-column($width);
+    }
+  }
+
+  // These *must* be defined in a separate loop as they have the same
+  // specificity as the non-breakpoint specific classes, so need to appear after
+  // them in the outputted CSS
+  @each $width in map.keys(base.$govuk-grid-widths) {
+    .govuk-grid-column-#{$width}-from-desktop {
+      @include base.govuk-grid-column($width, $at: desktop);
+    }
+  }
+}
+

data/node_modules/govuk-frontend/dist/govuk/objects/_grid.scss

@@ -1,26 +1,5 @@
-@import "../base";
+@use "grid.mixin" as grid;
+@use "../custom-properties";
 
-@include govuk-exports("govuk/objects/grid") {
-  .govuk-grid-row {
-    @include govuk-clearfix;
-    margin-right: -($govuk-gutter-half);
-    margin-left: -($govuk-gutter-half);
-  }
+@include grid.styles;
 
-  @each $width in map-keys($govuk-grid-widths) {
-    .govuk-grid-column-#{$width} {
-      @include govuk-grid-column($width);
-    }
-  }
-
-  // These *must* be defined in a separate loop as they have the same
-  // specificity as the non-breakpoint specific classes, so need to appear after
-  // them in the outputted CSS
-  @each $width in map-keys($govuk-grid-widths) {
-    .govuk-grid-column-#{$width}-from-desktop {
-      @include govuk-grid-column($width, $at: desktop);
-    }
-  }
-}
-
-/*# sourceMappingURL=_grid.scss.map */

data/node_modules/govuk-frontend/dist/govuk/objects/_index.import.scss

@@ -0,0 +1,7 @@
+@import "button-group";
+@import "form-group";
+@import "grid";
+@import "main-wrapper";
+@import "template";
+@import "width-container";
+

data/node_modules/govuk-frontend/dist/govuk/objects/_index.scss

@@ -1,8 +1,7 @@
-@import "button-group";
-@import "form-group";
-@import "grid";
-@import "main-wrapper";
-@import "template";
-@import "width-container";
+@use "button-group";
+@use "form-group";
+@use "grid";
+@use "main-wrapper";
+@use "template";
+@use "width-container";
 
-/*# sourceMappingURL=_index.scss.map */

data/node_modules/govuk-frontend/dist/govuk/objects/_main-wrapper.import.scss

@@ -0,0 +1,8 @@
+@use "main-wrapper.mixin" as main-wrapper;
+
+@import "../base";
+
+@include govuk-exports("govuk/objects/main-wrapper") {
+  @include main-wrapper.styles;
+}
+

data/node_modules/govuk-frontend/dist/govuk/objects/_main-wrapper.mixin.scss

@@ -0,0 +1,55 @@
+@use "../base";
+
+////
+/// @group objects/layout
+////
+
+// Example usage with Breadcrumbs, phase banners, back links:
+// <div class="govuk-width-container">
+//   <!-- Breadcrumbs, phase banners, back links are placed in here. -->
+//   <div class="govuk-main-wrapper">
+//       <!-- Wrapper for the main content of your page which applies padding
+//            to the top / bottom -->
+//   </div>
+// </div>
+//
+// Example usage without Breadcrumbs, phase banners, back links:
+// <div class="govuk-width-container">
+//   <div class="govuk-main-wrapper govuk-main-wrapper--l">
+//       <!-- Wrapper for the main content of your page which applies padding
+//            to the top / bottom -->
+//   </div>
+// </div>
+
+/// @access private
+@mixin styles {
+  .govuk-main-wrapper {
+    // In IE11 the `main` element can be used, but is not recognized  –
+    // meaning it's not defined in IE's default style sheet,
+    // so it uses CSS initial value, which is inline.
+    display: block;
+    padding-top: base.govuk-spacing(4);
+    padding-bottom: base.govuk-spacing(4);
+
+    @media #{base.govuk-from-breakpoint(tablet)} {
+      // This spacing is manually adjusted to replicate the margin of
+      // govuk-heading-xl (50px) minus the spacing of back link and
+      // breadcrumbs (10px)
+      padding-top: base.govuk-spacing(7);
+      padding-bottom: base.govuk-spacing(7);
+    }
+  }
+
+  // Using the `.govuk-main-wrapper--auto-spacing` modifier should apply the
+  // correct spacing depending on whether there are any elements
+  // (such the back link, breadcrumbs or phase banner components) before the
+  // `.govuk-main-wrapper` in the `govuk-width-container`.
+  //
+  // If you need to control the spacing manually, use the
+  // `govuk-main-wrapper--l` modifier instead.
+  .govuk-main-wrapper--auto-spacing:first-child,
+  .govuk-main-wrapper--l {
+    @include base.govuk-responsive-padding(8, "top");
+  }
+}
+

data/node_modules/govuk-frontend/dist/govuk/objects/_main-wrapper.scss

@@ -1,55 +1,5 @@
-@import "../base";
+@use "main-wrapper.mixin" as main-wrapper;
+@use "../custom-properties";
 
-////
-/// @group objects/layout
-////
+@include main-wrapper.styles;
 
-// Example usage with Breadcrumbs, phase banners, back links:
-// <div class="govuk-width-container">
-//   <!-- Breadcrumbs, phase banners, back links are placed in here. -->
-//   <div class="govuk-main-wrapper">
-//       <!-- Wrapper for the main content of your page which applies padding
-//            to the top / bottom -->
-//   </div>
-// </div>
-//
-// Example usage without Breadcrumbs, phase banners, back links:
-// <div class="govuk-width-container">
-//   <div class="govuk-main-wrapper govuk-main-wrapper--l">
-//       <!-- Wrapper for the main content of your page which applies padding
-//            to the top / bottom -->
-//   </div>
-// </div>
-
-@include govuk-exports("govuk/objects/main-wrapper") {
-  .govuk-main-wrapper {
-    // In IE11 the `main` element can be used, but is not recognized  –
-    // meaning it's not defined in IE's default style sheet,
-    // so it uses CSS initial value, which is inline.
-    display: block;
-    padding-top: govuk-spacing(4);
-    padding-bottom: govuk-spacing(4);
-
-    @include govuk-media-query($from: tablet) {
-      // This spacing is manually adjusted to replicate the margin of
-      // govuk-heading-xl (50px) minus the spacing of back link and
-      // breadcrumbs (10px)
-      padding-top: govuk-spacing(7);
-      padding-bottom: govuk-spacing(7);
-    }
-  }
-
-  // Using the `.govuk-main-wrapper--auto-spacing` modifier should apply the
-  // correct spacing depending on whether there are any elements
-  // (such the back link, breadcrumbs or phase banner components) before the
-  // `.govuk-main-wrapper` in the `govuk-width-container`.
-  //
-  // If you need to control the spacing manually, use the
-  // `govuk-main-wrapper--l` modifier instead.
-  .govuk-main-wrapper--auto-spacing:first-child,
-  .govuk-main-wrapper--l {
-    @include govuk-responsive-padding(8, "top");
-  }
-}
-
-/*# sourceMappingURL=_main-wrapper.scss.map */

data/node_modules/govuk-frontend/dist/govuk/objects/_template.import.scss

@@ -0,0 +1,8 @@
+@use "template.mixin" as template;
+
+@import "../base";
+
+@include govuk-exports("govuk/objects/template") {
+  @include template.styles;
+}
+

data/node_modules/govuk-frontend/dist/govuk/objects/_template.mixin.scss

@@ -0,0 +1,53 @@
+@use "../base";
+
+/// @access private
+@mixin styles {
+  // Applied to the <html> element
+  .govuk-template {
+    // Set the overall page background colour to the same colour as used by the
+    // footer to give the illusion of a long footer.
+    background-color: base.govuk-functional-colour(template-background);
+
+    // Prevent automatic text sizing, as we already cater for small devices and
+    // would like the browser to stay on 100% text zoom by default.
+    -webkit-text-size-adjust: 100%;
+       -moz-text-size-adjust: 100%;
+            text-size-adjust: 100%;
+
+    // Add scroll padding to the top of govuk-template but remove it if the
+    // exit this page component is present.
+    //
+    // This is a solution to exit this page potentially failing WCAG SC 2.4.12:
+    // Focus Not Obscured (https://www.w3.org/WAI/WCAG22/Understanding/focus-not-obscured-minimum.html)
+    // due to it's sticky positioning.
+    //
+    // This will apply scroll-padding-top in any browsers that don't support :has
+    // (https://caniuse.com/css-has). This is part of the reason we do this in
+    // a "wrong way round" way as we hypothesise that the risks of having
+    // scroll-padding unnecessarily is better than risking not having scroll-padding
+    // and needing it to account for exit this page.
+    @supports ((position: -webkit-sticky) or (position: sticky)) {
+      scroll-padding-top: base.govuk-spacing(9);
+
+      &:not(:has(.govuk-exit-this-page)) {
+        scroll-padding-top: 0;
+      }
+    }
+
+    // Force the scrollbar to always display in IE, to prevent horizontal page
+    // jumps as content height changes (e.g. autocomplete results open).
+    @media screen {
+      overflow-y: scroll;
+    }
+  }
+
+  // Applied to the <body> element
+  .govuk-template__body {
+    // The default margins set by user-agents are not required since we have our
+    // own containers.
+    margin: 0;
+    // Set the overall body of the page back to the typical background colour.
+    background-color: base.govuk-functional-colour(body-background);
+  }
+}
+

data/node_modules/govuk-frontend/dist/govuk/objects/_template.scss

@@ -1,57 +1,5 @@
-@import "../base";
+@use "template.mixin" as template;
+@use "../custom-properties";
 
-@include govuk-exports("govuk/objects/template") {
-  // Applied to the <html> element
-  .govuk-template {
-    // Set the overall page background colour to the same colour as used by the
-    // footer to give the illusion of a long footer.
-    @include _govuk-rebrand(
-      background-color,
-      $from: $govuk-template-background-colour,
-      $to: $_govuk-rebrand-template-background-colour
-    );
+@include template.styles;
 
-    // Prevent automatic text sizing, as we already cater for small devices and
-    // would like the browser to stay on 100% text zoom by default.
-    -webkit-text-size-adjust: 100%;
-       -moz-text-size-adjust: 100%;
-            text-size-adjust: 100%;
-
-    // Add scroll padding to the top of govuk-template but remove it if the
-    // exit this page component is present.
-    //
-    // This is a solution to exit this page potentially failing WCAG SC 2.4.12:
-    // Focus Not Obscured (https://www.w3.org/WAI/WCAG22/Understanding/focus-not-obscured-minimum.html)
-    // due to it's sticky positioning.
-    //
-    // This will apply scroll-padding-top in any browsers that don't support :has
-    // (https://caniuse.com/css-has). This is part of the reason we do this in
-    // a "wrong way round" way as we hypothesise that the risks of having
-    // scroll-padding unnecessarily is better than risking not having scroll-padding
-    // and needing it to account for exit this page.
-    @supports ((position: -webkit-sticky) or (position: sticky)) {
-      scroll-padding-top: govuk-spacing(9);
-
-      &:not(:has(.govuk-exit-this-page)) {
-        scroll-padding-top: 0;
-      }
-    }
-
-    // Force the scrollbar to always display in IE, to prevent horizontal page
-    // jumps as content height changes (e.g. autocomplete results open).
-    @include govuk-media-query($media-type: screen) {
-      overflow-y: scroll;
-    }
-  }
-
-  // Applied to the <body> element
-  .govuk-template__body {
-    // The default margins set by user-agents are not required since we have our
-    // own containers.
-    margin: 0;
-    // Set the overall body of the page back to the typical background colour.
-    background-color: $govuk-body-background-colour;
-  }
-}
-
-/*# sourceMappingURL=_template.scss.map */