hmrc-frontend 6.116.0 → 7.0.0

package/hmrc/components/header/template.njk

@@ -7,108 +7,45 @@
 {% from "govuk/macros/attributes.njk" import govukAttributes %}
 {% from "govuk/macros/logo.njk" import govukLogo -%}
 
-{%- set _rebrand = params.rebrand | default(govukRebrand() if govukRebrand is callable else govukRebrand) -%}
-
-{%- set menuButtonText = params.menuButtonText if params.menuButtonText else ('Dewislen' if language == 'cy' else 'Menu') -%}
-
-<header>
-<div class="govuk-header hmrc-header {%- if params.classes %} {{ params.classes }}{% endif %}{{ ' hmrc-header--with-additional-navigation' if params.signOutHref or params.languageToggle }}{{ ' govuk-header--full-width-border' if params.serviceNavigation }}" data-module="govuk-header"
+<header class="govuk-template__header {%- if params.headerClasses %} {{ params.headerClasses }}{% endif %}" {{- govukAttributes(params.headerAttributes)}}>
+<div class="govuk-header hmrc-header {%- if params.classes %} {{ params.classes }}{% endif %}{{ ' hmrc-header--with-additional-navigation' if params.signOutHref }}" data-module="govuk-header"
   {{- govukAttributes(params.attributes) }}>
   <div class="govuk-header__container {{ params.containerClasses | default("govuk-width-container", true) }}">
     <div class="govuk-header__logo">
-      <a href="{{ params.homepageUrl | default("/", true) }}" class="govuk-header__link govuk-header__link--homepage">
+      <a href="{{ params.homepageUrl | default("//gov.uk", true) }}" class="govuk-header__homepage-link">
         {{ govukLogo({
           classes: "govuk-header__logotype",
-          ariaLabelText: "GOV.UK",
-          useTudorCrown: params.useTudorCrown,
-          rebrand: _rebrand
-        }) | trim | indent(8) }}
+          ariaLabelText: "GOV.UK"
+            }) | trim | indent(8) }}
         {% if (params.productName) %}
-        <span class="govuk-header__product-name">{{ params.productName }}</span>
-        {% endif %}
+        <span class="govuk-header__product-name">
+        {{- params.productName -}}
+        </span>
+      {% endif %}
       </a>
     </div>
-  {% if params.serviceName or params.navigation | length or params.signOutHref or params.languageToggle %}
-    <div class="govuk-header__content">
-    {% if params.serviceName %}
-      {% if params.serviceUrl %}
-      <a href="{{ params.serviceUrl }}" class="govuk-header__link govuk-header__service-name">
-        {{ params.serviceName }}
-      </a>
-      {% else %}
-      <span class="govuk-header__service-name">
-        {{ params.serviceName }}
-      </span>
-      {% endif %}
-    {% endif %}
-    {% if params.navigation | length %}
-      <nav aria-label="{{ params.navigationLabel | default(menuButtonText, true) }}" class="govuk-header__navigation {%- if params.navigationClasses %} {{ params.navigationClasses }}{% endif %}">
-        <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" {%- if params.menuButtonLabel and params.menuButtonLabel != menuButtonText %} aria-label="{{ params.menuButtonLabel }}"{% endif %} hidden>
-          {{ menuButtonText }}
-        </button>
-
-        <ul id="navigation" class="govuk-header__navigation-list">
-        {% for item in params.navigation %}
-          {% if item.text or item.html %}
-          <li class="govuk-header__navigation-item {%- if item.active %} govuk-header__navigation-item--active{% endif %}">
-            {% if item.href %}
-            <a class="govuk-header__link" href="{{ item.href }}"
-              {{- govukAttributes(item.attributes) -}}>
-            {% endif %}
-              {{ item.html | safe | trim | indent(14) if item.html else item.text }}
-            {% if item.href %}
-            </a>
-            {% endif %}
-          </li>
-          {% endif %}
-        {% endfor %}
-        </ul>
-      </nav>
-    {% endif %}
     {% if params.signOutHref %}
       <nav class="hmrc-sign-out-nav">
         <a class="govuk-link hmrc-sign-out-nav__link" href="{{ params.signOutHref }}">
-        {% if language == 'cy' %}Allgofnodi{% else %}Sign out{% endif %}
+          {% if language == 'cy' %}Allgofnodi{% else %}Sign out{% endif %}
         </a>
       </nav>
-    {% elseif params.languageToggle %}{# TODO should this really be elseif? #}
-      <nav class="hmrc-language-select" {% if language == 'en' %} aria-label="Choose a language" {% else %} aria-label="Dewiswch iaith"{% endif %}>
-        <ul class="govuk-list hmrc-language-select__items">
-          <li class="govuk-header__navigation-item">
-            <a{% if language == 'en' %} aria-current="page"{% else %} class="govuk-header__link"{% endif %}
-              lang="en" hreflang="en" href="{{ params.languageToggle.en.href }}">English</a>
-          </li>
-          <li class="govuk-header__navigation-item">
-            <a {% if language == 'cy' %} aria-current="page"{% else %} class="govuk-header__link"{% endif %}
-              lang="cy" hreflang="cy" href="{{ params.languageToggle.cy.href }}">Cymraeg</a>
-          </li>
-        </ul>
-      </nav>
     {% endif %}
-    </div>
-  {% endif %}
   </div>
 </div>
-{% if params.displayHmrcBanner and not params.useDeprecatedPositionForHmrcBanner %}
+{% if params.displayHmrcBanner %}
   <div class="govuk-width-container">
-    {{ hmrcBanner({language: params.language, useTudorCrown: params.useTudorCrown}) }}
+    {{ hmrcBanner({language: params.language}) }}
   </div>
 {% endif %}
 {% if params.serviceNavigation %}
     {{ govukServiceNavigation(params.serviceNavigation) }}
 {% endif %}
 {%- if params.phaseBanner %}
-  <div class="govuk-width-container">
     {{ govukPhaseBanner(params.phaseBanner) }}
-  </div>
 {% endif %}
 {%- if params.userResearchBanner %}
     {{ hmrcUserResearchBanner({language: params.language, url: params.userResearchBanner.url }) }}
 {% endif %}
-{% if params.displayHmrcBanner and params.useDeprecatedPositionForHmrcBanner %}
-  <div class="govuk-width-container">
-    {{ hmrcBanner({language: params.language, useTudorCrown: params.useTudorCrown}) }}
-  </div>
-{% endif %}
 {{- params.additionalBannersBlock | safe }}
 </header>

package/hmrc/components/internal-header/template.njk

@@ -2,34 +2,18 @@
   <div class="{{ params.containerClasses | default("govuk-width-container", true) }}">
     <div class="hmrc-internal-header__logo">
       <a href="{{ params.homepageUrl | default('/') }}" class="hmrc-internal-header__logo-link">
-        {% if params.useTudorCrown | default(true) %}
-          <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 45.35 45.35" focusable="false" aria-hidden="true">
-            <path class="cls-1" d="m28.5,16.6c.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9-.84.34-1.23,1.31-.89,2.14.34.83,1.3,1.23,2.14.88Z"/>
-            <path class="cls-1" d="m22.06,19.36c-.84.34-1.23,1.31-.89,2.14.34.83,1.3,1.23,2.14.88.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9Z"/>
-            <path class="cls-1" d="m32.86,19.2c.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9-.84.34-1.23,1.31-.89,2.14.34.83,1.3,1.23,2.14.88Z"/>
-            <path class="cls-1" d="m33.62,22.63c.34.83,1.3,1.23,2.14.88.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9-.84.34-1.23,1.31-.89,2.14Z"/>
-            <path class="cls-1" d="m21.81,11.4c.06.08.13.15.21.21l-1.19,3.58s0,0,0,.01h0s0,0,0,0c-.06.18-.09.37-.09.56,0,.97.71,1.77,1.64,1.9.01,0,.03,0,.04,0,.08.01.16.02.24.02h0c.08,0,.16,0,.24-.02.01,0,.03,0,.04,0,.93-.14,1.64-.94,1.64-1.9,0-.2-.03-.39-.08-.56h0s0,0,0,0c0,0,0,0,0-.01l-1.19-3.58c.08-.06.15-.13.21-.21h0s2.06,1.08,2.06,1.08v-3.04l-2.06.65h0c-.06-.08-.12-.15-.2-.21h0s.83-2.62.83-2.62h-1.49s-1.49,0-1.49,0l.83,2.61h0c-.08.06-.14.13-.2.21h0s-2.06-.65-2.06-.65v3.04l2.06-1.08h0Z"/>
-            <path class="cls-1" d="m16.83,16.6c.84.35,1.79-.05,2.14-.88.34-.83-.05-1.79-.89-2.14-.82-.34-1.78.07-2.12.9-.34.83.05,1.78.88,2.12Z"/>
-            <path class="cls-1" d="m12.46,19.2c.84.35,1.79-.05,2.14-.88.34-.83-.05-1.79-.89-2.14-.82-.34-1.78.07-2.12.9-.34.83.05,1.78.88,2.12Z"/>
-            <path class="cls-1" d="m9.57,23.51c.84.35,1.79-.05,2.14-.88.34-.83-.05-1.79-.89-2.14-.82-.34-1.78.07-2.12.9-.34.83.05,1.78.88,2.12Z"/>
-            <path class="cls-1" d="m34.61,25.35c.22,1.12.26,1.65,0,2.37-.37-.36-.71-1.01-.98-2.02l-1.07,3.57c.65-.45,1.16-.74,1.73-.75-1.02,2.2-2.3,2.77-3.12,2.61-1.01-.19-1.47-1.09-1.32-1.85.23-1.08,1.34-1.36,1.86-.11.99-2.02-.69-2.65-1.77-2.05,1.66-1.66,1.85-3.13.51-4.92-1.87,1.43-1.89,2.84-1.05,4.84-1.09-1.25-2.79-.58-2.18,1.44.79-1.22,1.83-.45,1.67.71-.14,1.01-1.47,1.82-3.13,1.68-2.38-.22-2.52-1.86-2.58-3.21.58-.11,1.64.43,2.53,1.69l.33-3.79c-.98,1.02-1.86,1.21-2.85,1.24.33-1.02,1.84-2.7,1.84-2.7h-4.73s1.51,1.68,1.84,2.7c-.99-.03-1.87-.22-2.85-1.24l.33,3.79c.9-1.26,1.95-1.8,2.53-1.69-.06,1.36-.2,3-2.58,3.21-1.66.14-2.99-.67-3.13-1.68-.16-1.16.88-1.92,1.67-.71.61-2.02-1.09-2.69-2.18-1.44.84-1.99.82-3.41-1.05-4.84-1.34,1.78-1.15,3.26.51,4.92-1.08-.6-2.76.03-1.77,2.05.52-1.26,1.63-.98,1.86.11.16.76-.31,1.66-1.32,1.85-.83.15-2.1-.41-3.12-2.61.58.01,1.08.3,1.73.75l-1.07-3.57c-.27,1-.62,1.66-.98,2.02-.25-.72-.21-1.25,0-2.37l-2.21.79c1.18,1.6,2.31,3.86,3.25,7.79,3.29-.47,6.99-.74,10.9-.74s7.61.26,10.9.74c.94-3.93,2.07-6.19,3.25-7.79l-2.21-.79Z"/>
-            <path class="cls-1" d="m22.68.57C10.47.57.57,10.47.57,22.68s9.9,22.11,22.11,22.11,22.11-9.9,22.11-22.11S34.89.57,22.68.57Zm0,41.69c-10.81,0-19.58-8.77-19.58-19.58S11.86,3.1,22.68,3.1s19.58,8.77,19.58,19.58-8.77,19.58-19.58,19.58Z"/>
-          </svg>
-        {% else %}
-          <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 134.94 134.94" focusable="false" aria-hidden="true">
-            <path d="M104.32,73.72,101,73.29c.94-2,1.51-3.22,1.51-3.22,0-.38,1.11-2.22,1.53-3.73a19.94,19.94,0,0,0,.61-3.89,15.05,15.05,0,0,0-3.68-10.06,12.21,12.21,0,0,0-9.18-4.18,17.46,17.46,0,0,0-3.68.44c-2.09.52-3.08.81-4.93,1.29a51.13,51.13,0,0,0-8.85,3.61,1.37,1.37,0,0,0-.73.91,2,2,0,0,0-.07.53L73.31,71.6H70.53V53.46a4.05,4.05,0,0,1,.18-1.14,3.37,3.37,0,0,1,1.43-1.71c.6-.39,1.21-.75,1.82-1.08a2.49,2.49,0,1,1,3.87-2.07c0,.12,0,.25,0,.37l.16-.06c.55-.19,1.16-.37,1.75-.55a2.49,2.49,0,1,1,3.71-2.16,2.66,2.66,0,0,1-.3,1.16l2.06-.56.36-.08a2.49,2.49,0,1,1,3.87-2.07A2.42,2.42,0,0,1,89,44.82h.06a16.43,16.43,0,0,1,2.72-.18,2.45,2.45,0,0,1-.48-1.45,2.49,2.49,0,1,1,5,0,2.46,2.46,0,0,1-.89,1.89A16.46,16.46,0,0,1,98.1,46a2.41,2.41,0,0,1-.12-.72,2.5,2.5,0,1,1,3,2.44,16.7,16.7,0,0,1,2.12,1.91v-.08a2.49,2.49,0,1,1,2.49,2.49,2.15,2.15,0,0,1-.68-.11,18.34,18.34,0,0,1,1.25,2.26,2.49,2.49,0,0,1,4.55,1.4,2.5,2.5,0,0,1-2.49,2.5,2.64,2.64,0,0,1-.8-.15,20.9,20.9,0,0,1,.35,2.1,2.52,2.52,0,0,1,1-.19,2.49,2.49,0,1,1,0,5,2.59,2.59,0,0,1-1.07-.25c0,.26-.08.54-.11.82s-.14.55-.21.78a2.49,2.49,0,0,1-.32,5,2.39,2.39,0,0,1-1.39-.43c-.34.8-.78,1.83-1.27,3" />
-            <path d="M67.45,71.79a2.39,2.39,0,1,1,0-4.78h0a2.39,2.39,0,0,1,0,4.78Z" />
-            <path d="M67.47,66a2.28,2.28,0,1,0,0-4.56h0a2.28,2.28,0,0,0,0,4.56Z" />
-            <path d="M67.45,60.39a2.18,2.18,0,0,1,0-4.35h0a2.18,2.18,0,0,1,0,4.35Z" />
-            <path d="M67.47,50.17a2,2,0,0,0,0-4.09h0a2,2,0,1,0,0,4.09Z" />
-            <path d="M67.45,55.13a2.08,2.08,0,0,1,0-4.15h0a2.08,2.08,0,0,1,0,4.15Z" />
-            <path d="M74.67,22.23a.47.47,0,0,0-.46-.34.49.49,0,0,0-.49.34c-.47,1.83-1.41,3.55-5,3.86A6.43,6.43,0,0,1,70,22.5,5.37,5.37,0,0,1,73,21a.45.45,0,0,0,.3-.13.42.42,0,0,0,.1-.33.44.44,0,0,0-.14-.33.44.44,0,0,0-.29-.1H62a.44.44,0,0,0-.29.1.41.41,0,0,0-.14.33.46.46,0,0,0,.1.33A.47.47,0,0,0,62,21a5.37,5.37,0,0,1,3,1.51,6.43,6.43,0,0,1,1.28,3.59c-3.59-.31-4.53-2-5-3.86a.5.5,0,0,0-.49-.34.47.47,0,0,0-.46.34v10a.45.45,0,0,0,.51.42.46.46,0,0,0,.49-.29l0-.05a6.1,6.1,0,0,1,5-3.77,6.37,6.37,0,0,1-1.31,3.73A5.13,5.13,0,0,1,62,33.78h0a.64.64,0,0,0-.26.13.49.49,0,0,0-.1.35.37.37,0,0,0,.14.31.6.6,0,0,0,.32.12H72.89a.6.6,0,0,0,.32-.12.39.39,0,0,0,.14-.31.44.44,0,0,0-.1-.35.64.64,0,0,0-.26-.13h0A5.1,5.1,0,0,1,70,32.29a6.37,6.37,0,0,1-1.31-3.73,6.1,6.1,0,0,1,5,3.77v.05a.49.49,0,0,0,.5.29.45.45,0,0,0,.51-.42v-10Z" />
-            <path d="M67.47,45.72a5.29,5.29,0,1,0,0-10.57h0a5.29,5.29,0,1,0,0,10.57Z" />
-            <path d="M29.33,70.72a2.39,2.39,0,0,1-1.39.43,2.49,2.49,0,0,1-.32-5c-.07-.23-.13-.49-.21-.78s-.08-.56-.12-.82a2.51,2.51,0,0,1-1.07.25,2.49,2.49,0,0,1,0-5,2.35,2.35,0,0,1,1,.19c.08-.72.2-1.41.34-2.1a2.31,2.31,0,0,1-.79.15,2.5,2.5,0,1,1,2.06-3.9A18.34,18.34,0,0,1,30,51.94a2.15,2.15,0,0,1-.68.11,2.49,2.49,0,1,1,2.49-2.49v.08A16.12,16.12,0,0,1,34,47.73a2.49,2.49,0,1,1,3-2.43,2.23,2.23,0,0,1-.13.72,14.4,14.4,0,0,1,2.7-.94,2.49,2.49,0,1,1,4.09-1.9,2.45,2.45,0,0,1-.48,1.45,16.43,16.43,0,0,1,2.72.18h0a2.53,2.53,0,0,1-.37-1.31,2.49,2.49,0,1,1,3.87,2.07l.36.09,2.06.55a2.53,2.53,0,0,1-.3-1.16,2.49,2.49,0,1,1,5,0,2.46,2.46,0,0,1-1.27,2.15c.59.19,1.2.37,1.76.56l.15.06c0-.12,0-.25,0-.37A2.5,2.5,0,1,1,61,49.53c.61.33,1.22.69,1.82,1.08a3.37,3.37,0,0,1,1.43,1.71,3.66,3.66,0,0,1,.18,1.14V71.6H61.6L61.42,55a1.56,1.56,0,0,0-.07-.53,1.4,1.4,0,0,0-.73-.91,51.17,51.17,0,0,0-8.86-3.61c-1.84-.48-2.84-.77-4.93-1.29a17.33,17.33,0,0,0-3.67-.44A12.21,12.21,0,0,0,34,52.39,15.05,15.05,0,0,0,30.3,62.45a19.75,19.75,0,0,0,.61,3.88c.42,1.52,1.48,3.36,1.53,3.74,0,0,.57,1.18,1.51,3.22l-3.35.43c-.49-1.17-.93-2.2-1.27-3" />
-            <path d="M91.11,94.65A1.45,1.45,0,0,1,89.58,96l-7.89-.42a1.47,1.47,0,0,1-1.39-1.53L80.37,93a1.44,1.44,0,0,1,1.53-1.38l7.89.42a1.45,1.45,0,0,1,1.39,1.52Zm-20.47-1-2.81,2.81a.57.57,0,0,1-.36.16h0a.57.57,0,0,1-.36-.16l-2.82-2.81a.56.56,0,0,1,0-.81L67.09,90a.57.57,0,0,1,.36-.16h0a.57.57,0,0,1,.36.16l2.81,2.81a.55.55,0,0,1,0,.81m-17.41,2L45.34,96a1.45,1.45,0,0,1-1.53-1.37l-.07-1.13A1.46,1.46,0,0,1,45.13,92L53,91.58A1.45,1.45,0,0,1,54.55,93l.07,1.11a1.47,1.47,0,0,1-1.39,1.53m53.32-19.89a1.65,1.65,0,0,0-1.14-.66L100,74.32a.43.43,0,0,0-.43.39.45.45,0,0,0,.28.54h0a7,7,0,0,1,4,6.41c-3.92-.81-4.9-2.82-5.15-5.6,0-.12-.11-.33-.44-.36a.46.46,0,0,0-.49.25v0L96.24,88v0a.48.48,0,0,0,.91.16A7,7,0,0,1,103.5,84a8,8,0,0,1-5.59,5.74h0c-2-.22-4.09-.41-6.18-.59a5.1,5.1,0,0,1-4-4.14,3.86,3.86,0,0,1,.21-1c.51-1.36,1.49-2.25,2.58-1.85s1.26,1.72.76,3.07a3.58,3.58,0,0,1-.89,1.37A3.58,3.58,0,0,0,93.51,85c1.39-2,1.23-5-.94-6.27-1.42-.83-3.38.13-4.87,2,.45-2.93,2.23-5.52,2.43-7.78.29-3.19-.94-6.74-2.69-7.71-1.82.67-3.48,4-3.64,7.13-.1,2.27,1.43,5.26,1.51,8.25-1.23-2.13-3.1-3.4-4.63-2.76-2.32.94-2.91,3.94-1.8,6.09a3.67,3.67,0,0,0,2.85,2,3.45,3.45,0,0,1-.7-1.48c-.31-1.42,0-2.67,1.17-2.94s2,.76,2.3,2.18a3.64,3.64,0,0,1,0,1.31h0C83.65,87.2,82,87.94,80,88.44q-3.09-.14-6.23-.2h0l-.22,0c-2.94-.48-4.43-2.35-4.73-5.87a6.85,6.85,0,0,1,5.53,4.22.56.56,0,0,0,.55.35.48.48,0,0,0,.54-.44V75.35a.51.51,0,0,0-.5-.36.56.56,0,0,0-.51.33h0v0c-.52,2-1.58,4-5.61,4.3.33-3.93,2.12-5.13,4.74-5.7a.43.43,0,0,0,.3-.14.48.48,0,0,0,.13-.32v0a.52.52,0,0,0-.16-.35.5.5,0,0,0-.3-.11H61.41a.5.5,0,0,0-.3.11.57.57,0,0,0-.17.35v0a.48.48,0,0,0,.13.32.46.46,0,0,0,.31.14c2.61.57,4.41,1.77,4.74,5.7-4-.33-5.1-2.26-5.61-4.3v0h0A.56.56,0,0,0,60,75a.5.5,0,0,0-.5.36v11.1a.48.48,0,0,0,.54.44.53.53,0,0,0,.54-.35,6.87,6.87,0,0,1,5.54-4.22c-.3,3.52-1.79,5.39-4.73,5.87l-.23,0h0c-2.08,0-4.16.11-6.22.2-2-.5-3.66-1.24-4.56-3.37h0a3.43,3.43,0,0,1,.05-1.31c.31-1.42,1.16-2.42,2.3-2.18s1.47,1.52,1.17,2.94A3.69,3.69,0,0,1,53.2,86,3.67,3.67,0,0,0,56,84c1.1-2.15.52-5.15-1.8-6.09-1.54-.64-3.41.63-4.63,2.76.08-3,1.61-6,1.51-8.25-.16-3.18-1.82-6.46-3.64-7.13-1.75,1-3,4.52-2.69,7.71.2,2.26,2,4.85,2.43,7.78-1.49-1.86-3.46-2.82-4.87-2C40.18,80,40,83.07,41.41,85a3.58,3.58,0,0,0,3.08,1.63,3.58,3.58,0,0,1-.89-1.37c-.51-1.35-.39-2.64.76-3.07s2.07.49,2.58,1.85a3.86,3.86,0,0,1,.21,1,5.11,5.11,0,0,1-4,4.14c-2.07.18-4.13.37-6.17.59h0A8,8,0,0,1,31.42,84a7,7,0,0,1,6.35,4.12.45.45,0,0,0,.53.27.45.45,0,0,0,.38-.43v0L37.19,76v0a.47.47,0,0,0-.5-.25c-.32,0-.44.24-.44.36C36,78.83,35,80.84,31.1,81.65a7,7,0,0,1,4-6.41h0a.45.45,0,0,0,.28-.54.43.43,0,0,0-.43-.39l-5.46.73a1.65,1.65,0,0,0-1.14.66,1.84,1.84,0,0,0-.26,1.44c.14.81,1.79,12.39,1.94,13.45,0,.1.15,1.18.19,1.5a1.36,1.36,0,0,0,.48.67s2.42,1.64,2.84,2a.74.74,0,0,1,.18.86l-2.15,3.14a2,2,0,0,0-.26.42,1.19,1.19,0,0,0,.39,1.34H103.2a1.19,1.19,0,0,0,.39-1.34,2,2,0,0,0-.26-.42l-2.15-3.14a.75.75,0,0,1,.17-.86c.43-.33,2.85-2,2.85-2a1.36,1.36,0,0,0,.48-.67c0-.32.17-1.4.18-1.5.16-1.06,1.81-12.64,2-13.45a1.84,1.84,0,0,0-.26-1.44" />
-            <path d="M67.47,7.72a59.76,59.76,0,1,0,59.75,59.75A59.75,59.75,0,0,0,67.47,7.72m67.47,59.75A67.47,67.47,0,1,1,67.47,0a67.47,67.47,0,0,1,67.47,67.47" />
-          </svg>
-        {% endif %}
+        <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 45.35 45.35" focusable="false" aria-hidden="true">
+          <path class="cls-1" d="m28.5,16.6c.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9-.84.34-1.23,1.31-.89,2.14.34.83,1.3,1.23,2.14.88Z"/>
+          <path class="cls-1" d="m22.06,19.36c-.84.34-1.23,1.31-.89,2.14.34.83,1.3,1.23,2.14.88.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9Z"/>
+          <path class="cls-1" d="m32.86,19.2c.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9-.84.34-1.23,1.31-.89,2.14.34.83,1.3,1.23,2.14.88Z"/>
+          <path class="cls-1" d="m33.62,22.63c.34.83,1.3,1.23,2.14.88.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9-.84.34-1.23,1.31-.89,2.14Z"/>
+          <path class="cls-1" d="m21.81,11.4c.06.08.13.15.21.21l-1.19,3.58s0,0,0,.01h0s0,0,0,0c-.06.18-.09.37-.09.56,0,.97.71,1.77,1.64,1.9.01,0,.03,0,.04,0,.08.01.16.02.24.02h0c.08,0,.16,0,.24-.02.01,0,.03,0,.04,0,.93-.14,1.64-.94,1.64-1.9,0-.2-.03-.39-.08-.56h0s0,0,0,0c0,0,0,0,0-.01l-1.19-3.58c.08-.06.15-.13.21-.21h0s2.06,1.08,2.06,1.08v-3.04l-2.06.65h0c-.06-.08-.12-.15-.2-.21h0s.83-2.62.83-2.62h-1.49s-1.49,0-1.49,0l.83,2.61h0c-.08.06-.14.13-.2.21h0s-2.06-.65-2.06-.65v3.04l2.06-1.08h0Z"/>
+          <path class="cls-1" d="m16.83,16.6c.84.35,1.79-.05,2.14-.88.34-.83-.05-1.79-.89-2.14-.82-.34-1.78.07-2.12.9-.34.83.05,1.78.88,2.12Z"/>
+          <path class="cls-1" d="m12.46,19.2c.84.35,1.79-.05,2.14-.88.34-.83-.05-1.79-.89-2.14-.82-.34-1.78.07-2.12.9-.34.83.05,1.78.88,2.12Z"/>
+          <path class="cls-1" d="m9.57,23.51c.84.35,1.79-.05,2.14-.88.34-.83-.05-1.79-.89-2.14-.82-.34-1.78.07-2.12.9-.34.83.05,1.78.88,2.12Z"/>
+          <path class="cls-1" d="m34.61,25.35c.22,1.12.26,1.65,0,2.37-.37-.36-.71-1.01-.98-2.02l-1.07,3.57c.65-.45,1.16-.74,1.73-.75-1.02,2.2-2.3,2.77-3.12,2.61-1.01-.19-1.47-1.09-1.32-1.85.23-1.08,1.34-1.36,1.86-.11.99-2.02-.69-2.65-1.77-2.05,1.66-1.66,1.85-3.13.51-4.92-1.87,1.43-1.89,2.84-1.05,4.84-1.09-1.25-2.79-.58-2.18,1.44.79-1.22,1.83-.45,1.67.71-.14,1.01-1.47,1.82-3.13,1.68-2.38-.22-2.52-1.86-2.58-3.21.58-.11,1.64.43,2.53,1.69l.33-3.79c-.98,1.02-1.86,1.21-2.85,1.24.33-1.02,1.84-2.7,1.84-2.7h-4.73s1.51,1.68,1.84,2.7c-.99-.03-1.87-.22-2.85-1.24l.33,3.79c.9-1.26,1.95-1.8,2.53-1.69-.06,1.36-.2,3-2.58,3.21-1.66.14-2.99-.67-3.13-1.68-.16-1.16.88-1.92,1.67-.71.61-2.02-1.09-2.69-2.18-1.44.84-1.99.82-3.41-1.05-4.84-1.34,1.78-1.15,3.26.51,4.92-1.08-.6-2.76.03-1.77,2.05.52-1.26,1.63-.98,1.86.11.16.76-.31,1.66-1.32,1.85-.83.15-2.1-.41-3.12-2.61.58.01,1.08.3,1.73.75l-1.07-3.57c-.27,1-.62,1.66-.98,2.02-.25-.72-.21-1.25,0-2.37l-2.21.79c1.18,1.6,2.31,3.86,3.25,7.79,3.29-.47,6.99-.74,10.9-.74s7.61.26,10.9.74c.94-3.93,2.07-6.19,3.25-7.79l-2.21-.79Z"/>
+          <path class="cls-1" d="m22.68.57C10.47.57.57,10.47.57,22.68s9.9,22.11,22.11,22.11,22.11-9.9,22.11-22.11S34.89.57,22.68.57Zm0,41.69c-10.81,0-19.58-8.77-19.58-19.58S11.86,3.1,22.68,3.1s19.58,8.77,19.58,19.58-8.77,19.58-19.58,19.58Z"/>
+        </svg>
         <span class="hmrc-internal-header__logo-text">{% if params.language == 'cy' %}
           Cyllid a Thollau EF
         {% else %}

package/hmrc/components/service-navigation-language-select/_service-navigation-language-select.scss

@@ -48,21 +48,19 @@
 .govuk-service-navigation .hmrc-service-navigation-language-select .hmrc-service-navigation-language-select__list {
   position: relative;
   padding-left: 0;
+  margin-top: 12px;
+  margin-bottom: 12px;
 
   @include govuk-responsive-margin(6, $direction: left);
 
   @include govuk-media-query($from: tablet) {
     margin-top: 0;
     margin-bottom: 0;
-    padding: govuk-spacing(4) 0;
+    padding: govuk-spacing(3) 0;
 
-    .govuk-template--rebranded & {
-      padding: govuk-spacing(3) 0;
-
-      // some magic numbers from govuk-frontend service nav rebrand,
-      // adapted for the 16px font-size of the language switcher
-      line-height: (29 / 16);
-    }
+    // some magic numbers from govuk-frontend service nav rebrand,
+    // adapted for the 16px font-size of the language switcher
+    line-height: (29 / 16);
   }
 }
 

package/hmrc/components/service-navigation-language-select/layout.njk

@@ -29,7 +29,7 @@
   }) }}
 {% endblock %}
 
-{% block main %}
+{% block container %}
   <div class="govuk-width-container">
           <main class="govuk-main-wrapper" id="main-content">
 

package/hmrc/govuk/images/favicon.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#0b0c0c" d="M0 0h32v32H0z"/><path fill="#fff" d="m16.88 7.87 2.11 1.1V5.86l-2.11.67c-.06-.08-.13-.15-.2-.21s.85-2.68.85-2.68h-3.04l.85 2.67c-.08.07-.15.14-.2.21s-2.11-.66-2.11-.66v3.11l2.11-1.11c.06.09.14.16.22.22l-1.21 3.66v.01c0 .01 0 0 0 0-.06.18-.09.38-.09.58 0 .99.73 1.81 1.68 1.95h.04c.08.01.16.02.25.02.08 0 .17 0 .25-.02h.04c.95-.14 1.68-.96 1.68-1.95 0-.2-.03-.39-.09-.58s0 0 0-.01L16.7 8.08c.08-.06.16-.13.22-.22M9.16 12.3a1.75 1.75 0 1 0 1.52-3.15c-.86-.41-1.91-.04-2.33.83s-.05 1.91.81 2.32M4.82 15.87c.9.37 1.92-.05 2.29-.94s-.05-1.92-.95-2.29c-.88-.36-1.91.07-2.28.96s.06 1.91.94 2.27M22.86 12.3a1.75 1.75 0 1 1-1.52-3.15c.86-.41 1.91-.04 2.33.83s.05 1.91-.81 2.32M27.18 15.84c-.9.37-1.92-.05-2.29-.94s.05-1.92.95-2.29c.88-.36 1.91.07 2.28.96s-.06 1.91-.94 2.27M16 25.68c3.59 0 6.99.24 10.02.68.86-3.61 1.91-5.68 2.99-7.16l-2.03-.72c.2 1.03.23 1.51 0 2.18-.34-.33-.65-.93-.9-1.85l-.99 3.28c.6-.41 1.06-.68 1.59-.69-.94 2.02-2.11 2.54-2.87 2.4-.93-.17-1.35-1-1.21-1.7.21-.99 1.23-1.25 1.71-.1.91-1.86-.63-2.44-1.63-1.89 1.53-1.52 1.7-2.88.47-4.52-1.72 1.31-1.74 2.61-.97 4.44-1-1.15-2.56-.53-2 1.32.72-1.12 1.68-.42 1.53.65-.13.93-1.35 1.68-2.87 1.54-2.18-.2-2.31-1.71-2.37-2.95.54-.1 1.5.4 2.33 1.56l.3-3.48c-.9.93-1.71 1.11-2.62 1.14.3-.94 1.69-2.48 1.69-2.48h-4.34s1.38 1.54 1.69 2.48c-.91-.03-1.72-.21-2.62-1.14l.3 3.48c.82-1.16 1.79-1.66 2.33-1.56-.05 1.25-.18 2.75-2.37 2.95-1.52.13-2.75-.62-2.87-1.54-.15-1.06.81-1.77 1.53-.65.56-1.85-1-2.47-2-1.32.77-1.83.75-3.13-.97-4.44-1.23 1.64-1.06 2.99.47 4.52-.99-.55-2.54.03-1.63 1.89.48-1.16 1.5-.9 1.71.1.14.7-.28 1.53-1.21 1.7-.76.14-1.93-.38-2.87-2.4.53.01.99.28 1.59.69l-.99-3.28c-.25.92-.57 1.52-.9 1.85-.23-.66-.19-1.14 0-2.18l-2.03.72c1.08 1.47 2.13 3.54 2.99 7.16 3.03-.43 6.42-.68 10.01-.68"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#1D70B8" d="M0 0h32v32H0z"/><path fill="#fff" d="m16.88 7.87 2.11 1.1V5.86l-2.11.67c-.06-.08-.13-.15-.2-.21s.85-2.68.85-2.68h-3.04l.85 2.67c-.08.07-.15.14-.2.21s-2.11-.66-2.11-.66v3.11l2.11-1.11c.06.09.14.16.22.22l-1.21 3.66v.01c0 .01 0 0 0 0-.06.18-.09.38-.09.58 0 .99.73 1.81 1.68 1.95h.04c.08.01.16.02.25.02.08 0 .17 0 .25-.02h.04c.95-.14 1.68-.96 1.68-1.95 0-.2-.03-.39-.09-.58s0 0 0-.01L16.7 8.08c.08-.06.16-.13.22-.22M9.16 12.3a1.75 1.75 0 1 0 1.52-3.15c-.86-.41-1.91-.04-2.33.83s-.05 1.91.81 2.32M4.82 15.87c.9.37 1.92-.05 2.29-.94s-.05-1.92-.95-2.29c-.88-.36-1.91.07-2.28.96s.06 1.91.94 2.27M22.86 12.3a1.75 1.75 0 1 1-1.52-3.15c.86-.41 1.91-.04 2.33.83s.05 1.91-.81 2.32M27.18 15.84c-.9.37-1.92-.05-2.29-.94s.05-1.92.95-2.29c.88-.36 1.91.07 2.28.96s-.06 1.91-.94 2.27M16 25.68c3.59 0 6.99.24 10.02.68.86-3.61 1.91-5.68 2.99-7.16l-2.03-.72c.2 1.03.23 1.51 0 2.18-.34-.33-.65-.93-.9-1.85l-.99 3.28c.6-.41 1.06-.68 1.59-.69-.94 2.02-2.11 2.54-2.87 2.4-.93-.17-1.35-1-1.21-1.7.21-.99 1.23-1.25 1.71-.1.91-1.86-.63-2.44-1.63-1.89 1.53-1.52 1.7-2.88.47-4.52-1.72 1.31-1.74 2.61-.97 4.44-1-1.15-2.56-.53-2 1.32.72-1.12 1.68-.42 1.53.65-.13.93-1.35 1.68-2.87 1.54-2.18-.2-2.31-1.71-2.37-2.95.54-.1 1.5.4 2.33 1.56l.3-3.48c-.9.93-1.71 1.11-2.62 1.14.3-.94 1.69-2.48 1.69-2.48h-4.34s1.38 1.54 1.69 2.48c-.91-.03-1.72-.21-2.62-1.14l.3 3.48c.82-1.16 1.79-1.66 2.33-1.56-.05 1.25-.18 2.75-2.37 2.95-1.52.13-2.75-.62-2.87-1.54-.15-1.06.81-1.77 1.53-.65.56-1.85-1-2.47-2-1.32.77-1.83.75-3.13-.97-4.44-1.23 1.64-1.06 2.99.47 4.52-.99-.55-2.54.03-1.63 1.89.48-1.16 1.5-.9 1.71.1.14.7-.28 1.53-1.21 1.7-.76.14-1.93-.38-2.87-2.4.53.01.99.28 1.59.69l-.99-3.28c-.25.92-.57 1.52-.9 1.85-.23-.66-.19-1.14 0-2.18l-2.03.72c1.08 1.47 2.13 3.54 2.99 7.16 3.03-.43 6.42-.68 10.01-.68"/></svg>