hmrc-frontend 6.117.0 → 7.0.0

package/check-compatibility-with-govuk-frontend-version.js

@@ -31,7 +31,7 @@ function withinPrototypeKitAndUsingIncompatibleGovukFrontendVersion() {
   }
 
   const currentVersionInProject = projectPackageJson.dependencies['govuk-frontend'].replace(/[^0-9.]/g, '');
-  const minimumGovukFrontendVersion = '5.4.0';
+  const minimumGovukFrontendVersion = '6.0.0';
 
   return (!semverGreaterThanOrEqualTo(currentVersionInProject, minimumGovukFrontendVersion));
 }
@@ -44,15 +44,15 @@ try {
     // eslint-disable-next-line no-console
     process.stderr.write(`
     Hello friend, looks like your prototype is using a version of
-    govuk-frontend lower than v5.4.0, which is the minimum version
-    compatible to automatically compile and load the styles for the 
+    govuk-frontend lower than v6.0.0, which is the minimum version
+    compatible to automatically compile and load the styles for the
     version of hmrc-frontend you're installing with the govuk-prototype-kit.
 
     You can silence this warning by setting the environment variable
     HMRC_FRONTEND_DISABLE_COMPATIBILITY_CHECK=true.
       - PlatUI
     -------------------------------------------
-            \\   ^__^ 
+            \\   ^__^
             \\  (oo)_______
                 (__)       )\\/\\
                     ||----w |

package/govuk-prototype-kit.config.json

@@ -10,11 +10,10 @@
   "pluginDependencies": [
     {
       "packageName": "govuk-frontend",
-      "minVersion": "5.14.0"
+      "minVersion": "6.0.0"
     }
   ],
   "assets": [
-    "/hmrc/components/account-menu/images",
     "/hmrc/components/banner/images",
     "/hmrc/components/internal-header/images"
   ],
@@ -24,29 +23,15 @@
   "scripts": [
     "/hmrc/all.js",
     "/hmrc/init-all.js",
-    "/hmrc/accessible-autocomplete-6.117.0.js"
+    "/hmrc/accessible-autocomplete-7.0.0.js"
   ],
   "stylesheets": [
-    "/hmrc/accessible-autocomplete-6.117.0.css"
-  ],
-  "importNunjucksMacrosInto": [
-    "/hmrc/templates/account-header.html"
-  ],
-  "templates": [
-    {
-      "name": "Blank page with Account Header",
-      "path": "/hmrc/templates/account-header.html",
-      "type": "nunjucks"
-    }
+    "/hmrc/accessible-autocomplete-7.0.0.css"
   ],
   "nunjucksPaths": [
     "/"
   ],
   "nunjucksMacros": [
-    {
-      "macroName": "hmrcAccountMenu",
-      "importFrom": "hmrc/components/account-menu/macro.njk"
-    },
     {
       "macroName": "hmrcAddToAList",
       "importFrom": "hmrc/components/add-to-a-list/macro.njk"
@@ -59,10 +44,6 @@
       "macroName": "hmrcCharacterCount",
       "importFrom": "hmrc/components/character-count/macro.njk"
     },
-    {
-      "macroName": "hmrcCurrencyInput",
-      "importFrom": "hmrc/components/currency-input/macro.njk"
-    },
     {
       "macroName": "hmrcFooter",
       "importFrom": "hmrc/components/footer/macro.njk"
@@ -75,10 +56,6 @@
       "macroName": "hmrcInternalHeader",
       "importFrom": "hmrc/components/internal-header/macro.njk"
     },
-    {
-      "macroName": "hmrcLanguageSelect",
-      "importFrom": "hmrc/components/language-select/macro.njk"
-    },
     {
       "macroName": "hmrcListWithActions",
       "importFrom": "hmrc/components/list-with-actions/macro.njk"

package/hmrc/VERSION.txt

@@ -1 +1 @@
-6.117.0
+7.0.0

package/hmrc/{accessible-autocomplete-6.117.0.css → accessible-autocomplete-7.0.0.css}

@@ -1,2 +1,2 @@
-.autocomplete__wrapper{position:relative}.autocomplete__hint,.autocomplete__input{-webkit-appearance:none;-moz-appearance:none;appearance:none;border:2px solid #0b0c0c;border-radius:0;-webkit-box-sizing:border-box;box-sizing:border-box;height:2.5rem;line-height:1.25;margin-bottom:0;width:100%}.autocomplete__input{background-color:transparent;position:relative}.autocomplete__hint{color:#505a5f;position:absolute}.autocomplete__input--default{padding:5px}.autocomplete__input--focused{-webkit-box-shadow:inset 0 0 0 2px;box-shadow:inset 0 0 0 2px;outline:3px solid #fd0;outline-offset:0}.autocomplete__input--show-all-values{cursor:pointer;padding:5px 35px 5px 5px}.autocomplete__dropdown-arrow-down{display:inline-block;height:24px;position:absolute;right:8px;top:10px;width:24px;z-index:-1}.autocomplete__menu{background-color:#fff;border:2px solid #0b0c0c;border-top:0;color:#0b0c0c;margin:0;max-height:342px;overflow-x:hidden;padding:0;width:100%;width:calc(100% - 4px)}.autocomplete__menu--visible{display:block}.autocomplete__menu--hidden{display:none}.autocomplete__menu--overlay{-webkit-box-shadow:0 2px 6px rgba(0,0,0,.257);box-shadow:0 2px 6px rgba(0,0,0,.257);left:0;position:absolute;top:100%;z-index:100}.autocomplete__menu--inline{position:relative}.autocomplete__option{border-bottom:1px solid #b1b4b6;border-left-width:0;border-right-width:0;border-top-width:1px;cursor:pointer;display:block;position:relative}.autocomplete__option>*{pointer-events:none}.autocomplete__option:first-of-type{border-top-width:0}.autocomplete__option:last-of-type{border-bottom-width:0}.autocomplete__option--odd{background-color:#f3f2f1}.autocomplete__option--focused,.autocomplete__option:hover{background-color:#1d70b8;border-color:#1d70b8;color:#fff;outline:none}@media (-ms-high-contrast:active),(forced-colors:active){.autocomplete__menu{border-color:FieldText}.autocomplete__option{background-color:Field;color:FieldText}.autocomplete__option--focused,.autocomplete__option:hover{background-color:Highlight;background-color:SelectedItem;border-color:SelectedItem;color:HighlightText;color:SelectedItemText;forced-color-adjust:none;outline-color:SelectedItemText}}.autocomplete__option--no-results{background-color:#f3f2f1;color:#505a5f;cursor:not-allowed}.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:1rem;font-weight:400}.autocomplete__hint,.autocomplete__option{padding:5px}@media (min-width:641px){.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:1.1875rem;line-height:1.3157894737}}.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-family:GDS Transport,arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-size:1rem;font-weight:400;line-height:1.25}@media print{.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-family:sans-serif}}@media (min-width:40.0625em){.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-size:1.1875rem;line-height:1.3157894737}}@media print{.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-size:14pt;line-height:1.15}}.govuk-form-group--error div:has(+.govuk-select--error[data-module=hmrc-accessible-autocomplete])>.autocomplete__wrapper .autocomplete__input{border-color:#d4351c}.autocomplete__dropdown-arrow-down{pointer-events:none;z-index:0}
-/*# sourceMappingURL=maps/accessible-autocomplete-6.117.0.css.map */
+.autocomplete__wrapper{position:relative}.autocomplete__hint,.autocomplete__input{-webkit-appearance:none;-moz-appearance:none;appearance:none;border:2px solid #0b0c0c;border-radius:0;-webkit-box-sizing:border-box;box-sizing:border-box;height:2.5rem;line-height:1.25;margin-bottom:0;width:100%}.autocomplete__input{background-color:transparent;position:relative}.autocomplete__hint{color:#505a5f;position:absolute}.autocomplete__input--default{padding:5px}.autocomplete__input--focused{-webkit-box-shadow:inset 0 0 0 2px;box-shadow:inset 0 0 0 2px;outline:3px solid #fd0;outline-offset:0}.autocomplete__input--show-all-values{cursor:pointer;padding:5px 35px 5px 5px}.autocomplete__dropdown-arrow-down{display:inline-block;height:24px;position:absolute;right:8px;top:10px;width:24px;z-index:-1}.autocomplete__menu{background-color:#fff;border:2px solid #0b0c0c;border-top:0;color:#0b0c0c;margin:0;max-height:342px;overflow-x:hidden;padding:0;width:100%;width:calc(100% - 4px)}.autocomplete__menu--visible{display:block}.autocomplete__menu--hidden{display:none}.autocomplete__menu--overlay{-webkit-box-shadow:0 2px 6px rgba(0,0,0,.257);box-shadow:0 2px 6px rgba(0,0,0,.257);left:0;position:absolute;top:100%;z-index:100}.autocomplete__menu--inline{position:relative}.autocomplete__option{border-bottom:1px solid #b1b4b6;border-left-width:0;border-right-width:0;border-top-width:1px;cursor:pointer;display:block;position:relative}.autocomplete__option>*{pointer-events:none}.autocomplete__option:first-of-type{border-top-width:0}.autocomplete__option:last-of-type{border-bottom-width:0}.autocomplete__option--odd{background-color:#f3f2f1}.autocomplete__option--focused,.autocomplete__option:hover{background-color:#1d70b8;border-color:#1d70b8;color:#fff;outline:none}@media (-ms-high-contrast:active),(forced-colors:active){.autocomplete__menu{border-color:FieldText}.autocomplete__option{background-color:Field;color:FieldText}.autocomplete__option--focused,.autocomplete__option:hover{background-color:Highlight;background-color:SelectedItem;border-color:SelectedItem;color:HighlightText;color:SelectedItemText;forced-color-adjust:none;outline-color:SelectedItemText}}.autocomplete__option--no-results{background-color:#f3f2f1;color:#505a5f;cursor:not-allowed}.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:1rem;font-weight:400}.autocomplete__hint,.autocomplete__option{padding:5px}@media (min-width:641px){.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:1.1875rem;line-height:1.3157894737}}.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-family:GDS Transport,arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-size:1.1875rem;font-weight:400;line-height:1.3157894737}@media print{.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-family:sans-serif;font-size:14pt;line-height:1.15}}.govuk-form-group--error div:has(+.govuk-select--error[data-module=hmrc-accessible-autocomplete])>.autocomplete__wrapper .autocomplete__input{border-color:#d4351c}.autocomplete__dropdown-arrow-down{pointer-events:none;z-index:0}
+/*# sourceMappingURL=maps/accessible-autocomplete-7.0.0.css.map */

package/hmrc/all.js

@@ -4,113 +4,6 @@
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.HMRCFrontend = factory());
 })(this, (function () { 'use strict';
 
-  // Returns a function, that, as long as it continues to be invoked, will not
-  // be triggered. The function will be called after it stops being called for
-  // N milliseconds. If `immediate` is passed, trigger the function on the
-  // leading edge, instead of the trailing.
-
-  // eslint-disable-next-line  import/prefer-default-export
-  function debounce(func, wait, immediate) {
-    var _this = this;
-    var timeout;
-    return function () {
-      for (var _len = arguments.length, theParams = new Array(_len), _key = 0; _key < _len; _key++) {
-        theParams[_key] = arguments[_key];
-      }
-      var context = _this;
-      var later = function later() {
-        timeout = null;
-        func.apply(context, theParams);
-      };
-      clearTimeout(timeout);
-      timeout = setTimeout(later, wait);
-    };
-  }
-
-  // TODO
-  // Retrieve breakpoints from Sass vars?
-  var breakpoints = {
-    xs: 0,
-    mobile: 320,
-    tablet: 641,
-    desktop: 769
-  };
-  function getCurrentBreakpoint(windowWidth) {
-    var reducer = function reducer(acc, curr) {
-      var windowInsideBreakpoint = (windowWidth || window.innerWidth) >= breakpoints[curr];
-      return windowInsideBreakpoint ? curr : acc;
-    };
-    return Object.keys(breakpoints).reduce(reducer);
-  }
-
-  var isSmall = function isSmall(element) {
-    return element.innerWidth <= 768;
-  };
-  function AccountMenu($module) {
-    this.$module = document.querySelector($module);
-    this.$moduleBottomMargin = this.$module.style.marginBottom;
-    this.$mainNav = this.$module.querySelector('.hmrc-account-menu__main');
-    this.$showNavLinkMobile = this.$module.querySelector('.hmrc-account-menu__link--menu');
-    this.$currentBreakpoint = getCurrentBreakpoint();
-  }
-  AccountMenu.prototype.init = function init() {
-    this.setup();
-    this.$showNavLinkMobile.addEventListener('click', this.eventHandlers.showNavLinkMobileClick.bind(this));
-    window.addEventListener('resize', debounce(this.reinstantiate.bind(this)));
-  };
-  AccountMenu.prototype.reinstantiate = function reinstantiate(resizeEvent) {
-    var newBreakpoint = getCurrentBreakpoint(resizeEvent.target.innerWidth);
-    var hasCrossedBreakpoint = this.$currentBreakpoint !== newBreakpoint;
-    if (hasCrossedBreakpoint) {
-      this.$currentBreakpoint = newBreakpoint;
-      this.setup();
-    }
-  };
-  AccountMenu.prototype.eventHandlers = {
-    showNavLinkMobileClick: function showNavLinkMobileClick(event) {
-      event.preventDefault();
-      if (isSmall(window)) {
-        if (this.$mainNav.classList.contains('main-nav-is-open')) {
-          this.hideMainNavMobile(event.currentTarget);
-        } else {
-          this.showMainNavMobile();
-        }
-      }
-    }
-  };
-  AccountMenu.prototype.setup = function setup() {
-    if (isSmall(window)) {
-      this.$module.classList.add('is-smaller');
-      this.$showNavLinkMobile.setAttribute('aria-hidden', 'false');
-      this.$showNavLinkMobile.removeAttribute('tabindex');
-      this.$showNavLinkMobile.classList.remove('js-hidden');
-      this.hideMainNavMobile(this.$showNavLinkMobile);
-    } else {
-      this.$module.classList.remove('is-smaller');
-      this.$mainNav.classList.remove('main-nav-is-open', 'js-hidden');
-      this.$showNavLinkMobile.setAttribute('aria-hidden', 'true');
-      this.$showNavLinkMobile.setAttribute('tabindex', '-1');
-      this.$showNavLinkMobile.classList.add('js-hidden');
-    }
-  };
-  AccountMenu.prototype.showMainNavMobile = function showMainNavMobile() {
-    // TODO: shall we add main-nav-is-open to `nav`????
-    this.$mainNav.classList.remove('js-hidden');
-    this.$mainNav.classList.add('main-nav-is-open');
-    this.$mainNav.setAttribute('aria-expanded', 'true');
-    this.$showNavLinkMobile.setAttribute('aria-expanded', 'true');
-    this.$showNavLinkMobile.classList.add('hmrc-account-home--account--is-open');
-  };
-  AccountMenu.prototype.hideMainNavMobile = function hideMainNavMobile(element) {
-    this.$mainNav.classList.remove('main-nav-is-open');
-    this.$mainNav.setAttribute('aria-expanded', 'false');
-    if (element.classList.contains('hmrc-account-menu__link--menu')) {
-      this.$mainNav.classList.add('js-hidden');
-      this.$showNavLinkMobile.setAttribute('aria-expanded', 'false');
-      this.$showNavLinkMobile.classList.remove('hmrc-account-home--account--is-open');
-    }
-  };
-
   function BackLinkHelper($module, window, document) {
     this.$module = $module;
     this.window = window;
@@ -722,12 +615,6 @@
         console.error('hmrc-frontend component initialisation failed', error);
       }
     }
-    var $AccountMenuSelector = '[data-module="hmrc-account-menu"]';
-    if (document.querySelector($AccountMenuSelector)) {
-      logAndIgnoreErrors(function () {
-        new AccountMenu($AccountMenuSelector).init();
-      });
-    }
     var $HmrcPrintLinks = document.querySelectorAll('a[data-module="hmrc-print-link"]');
     $HmrcPrintLinks.forEach(function ($HmrcPrintLink) {
       logAndIgnoreErrors(function () {
@@ -757,7 +644,6 @@
   }
   var all = {
     initAll: initAll,
-    AccountMenu: AccountMenu,
     TimeoutDialog: TimeoutDialog,
     UserResearchBanner: UserResearchBanner,
     BackLinkHelper: BackLinkHelper

package/hmrc/components/_all.scss

@@ -1,13 +1,10 @@
-@import "account-menu/account-menu";
+@import "add-to-a-list/add-to-a-list";
 @import "banner/banner";
 @import "back-link-helper/back-link-helper";
-@import "currency-input/currency-input";
 @import "notification-badge/notification-badge";
 @import "page-heading/page-heading";
-@import "language-select/language-select";
 @import "header/header";
 @import "internal-header/internal-header";
-@import "add-to-a-list/add-to-a-list";
 @import "list-with-actions/list-with-actions";
 @import "timeout-dialog/timeout-dialog";
 @import "service-navigation-language-select/service-navigation-language-select";

package/hmrc/components/banner/template.njk

@@ -1,33 +1,17 @@
 <div class="hmrc-banner">
   <div class="hmrc-organisation-logo">
-    {% if params.useTudorCrown | default(true) %}
-      <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="26px" height="26px" 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="26px" height="26px" 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="26px" height="26px" 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>
     <p class="govuk-body-s">{% if params.language == 'cy' %}
         Cyllid a Thollau EF
       {% else %}

package/hmrc/components/footer/template.njk

@@ -1,4 +1,5 @@
 {% from "govuk/components/footer/macro.njk" import govukFooter %}
+{% from "govuk/macros/attributes.njk" import govukAttributes %}
 
 {% set contentLicenceHtml -%}
   {% if(params.language == 'cy') %}Mae‘r holl gynnwys ar gael o dan {% else %}All content is available under the {% endif %}
@@ -15,22 +16,23 @@
 
 {% set defaultMetaVisuallyHiddenTitle = "Cysylltiadau cymorth" if params.language == "cy" else "Support links" %}
 
-{{ govukFooter({
-  meta: {
-    visuallyHiddenTitle: params.meta.visuallyHiddenTitle | default(defaultMetaVisuallyHiddenTitle),
-    html: params.meta.html,
-    text: params.meta.text,
-    items: params.meta.items
-  } if params.meta,
-  navigation: params.navigation,
-  contentLicence: {
-    html: contentLicenceHtml
-  },
-  copyright: {
-    html: copyrightHtml
-  },
-  containerClasses: params.containerClasses,
-  classes: params.classes,
-  attributes: params.attributes,
-  rebrand: params.rebrand
-}) }}
+<footer class="govuk-template__footer {%- if params.footerClasses %} {{ params.footerClasses }}{% endif %}" {{- govukAttributes(params.footerAttributes)}}>
+  {{ govukFooter({
+    meta: {
+      visuallyHiddenTitle: params.meta.visuallyHiddenTitle | default(defaultMetaVisuallyHiddenTitle),
+      html: params.meta.html,
+      text: params.meta.text,
+      items: params.meta.items
+    } if params.meta,
+    navigation: params.navigation,
+    contentLicence: {
+      html: contentLicenceHtml
+    },
+    copyright: {
+      html: copyrightHtml
+    },
+    containerClasses: params.containerClasses,
+    classes: params.classes,
+    attributes: params.attributes
+  }) }}
+</footer>

package/hmrc/components/header/_header.scss

@@ -2,222 +2,52 @@
 $govuk-header-link-underline-thickness: 3px;
 
 .hmrc-header.hmrc-header--with-additional-navigation {
-  .govuk-header__service-name {
-    float: left;
-  }
+  @include govuk-clearfix;
 
-  .govuk-header__navigation-list {
-    clear: left;
+  .govuk-header__logo {
+    display: inline-block;
   }
 
   .hmrc-sign-out-nav {
     float: right;
-    margin-bottom: 10px;
-
-    @include govuk-media-query($from: desktop) {
-      padding-top: 10px;
-
-      .govuk-template--rebranded & {
-        padding-top: 29px;
-      }
-    }
-
-    .govuk-template--rebranded & {
-      margin-bottom: 15px;
-    }
-  }
-
-  .govuk-header__navigation + .hmrc-sign-out-nav {
-    padding-top: 4px;
-
-    @include govuk-media-query($from: tablet) {
-      padding-top: 10px;
-    }
-
-    @include govuk-media-query($from: desktop) {
-      padding-top: 0;
-    }
+    margin-left: 10px;
   }
 
   .hmrc-sign-out-nav__link {
+    @include govuk-link-common;
+    @include govuk-link-style-inverse;
+
+    position: relative;
+    display: inline-block;
+    padding: 22px 15px;
+    font-weight: 700;
     color: govuk-colour("white");
-    font-weight: bold;
     text-decoration: none;
-    margin-left: 10px;
-
-    &:hover {
-      text-decoration: underline;
-    }
 
     &:focus {
-      color: #0b0c0c;
+      -webkit-box-shadow: 0 0 $govuk-focus-colour;
+              box-shadow: 0 0 $govuk-focus-colour;
     }
 
-    .govuk-template--rebranded & {
-      @include govuk-link-common; // explicit choice to differ from govuk-frontend header links
-      @include govuk-link-style-inverse;
-
-      font-weight: normal;
-
-      &:hover {
-        text-decoration-thickness: $govuk-header-link-underline-thickness;
-      }
-    }
-  }
-
-  .hmrc-language-select {
-    padding-right: govuk-spacing(3);
-    float: right;
-
-    .govuk-template--rebranded & {
-      padding-right: 0;
+    &::after {
+      content: "";
+      display: none;
+      position: absolute;
+      height: $govuk-header-link-underline-thickness;
+      right: 15px;
+      bottom: 0;
+      left: 15px;
+      background-color: govuk-colour("white");
     }
 
-    .govuk-list {
-      margin-bottom: 0;
-
-      .govuk-template--rebranded & {
-        @include govuk-media-query($from: desktop) {
-          padding-top: govuk-spacing(3) + 3px; // makes the baseline match gov.uk logo and service name
-        }
-      }
-
-      .govuk-header__link {
-        .govuk-template--rebranded & {
-          @include govuk-link-common; // explicit choice to differ from govuk-frontend header links
-          @include govuk-link-style-inverse;
-
-          font-weight: normal;
-
-          &:hover {
-            text-decoration-thickness: $govuk-header-link-underline-thickness;
-          }
-        }
-      }
-
-      a:not(.govuk-header__link) {
-        @include govuk-font($size: 16, $weight: "bold");
-
-        color: govuk-colour("mid-grey");
-        text-decoration: none;
-
-        &:link,
-        &:hover,
-        &:visited,
-        &:focus {
-          .govuk-template--rebranded & {
-            font-weight: normal;
-            color: #ffffff;
-          }
-        }
-      }
+    &:hover::after {
+      display: block;
     }
 
-    .govuk-header__navigation-item {
-      display: inline-block;
-      margin-right: 0;
-      border-bottom: 0;
-
-      .govuk-template--rebranded & {
-        padding-top: 0;
-        padding-bottom: govuk-spacing(2);
-      }
+    &:focus::after {
+      display: block;
+      background-color: govuk-colour('black');
     }
-
-    .govuk-header__navigation-item + .govuk-header__navigation-item::before {
-      content: "|";
-      padding-right: 2px;
-      color: govuk-colour("dark-grey");
-
-      .govuk-template--rebranded & {
-        color: #ffffff50; // is this acceptable? mimics the existing light grey...
-      }
-    }
-  }
-}
-
-.govuk-template--rebranded .hmrc-header.hmrc-header--with-additional-navigation .govuk-header__navigation + .hmrc-language-select .govuk-list {
-  padding-top: 0;
-}
-
-.hmrc-header__service-name {
-  display: inline-block;
-  margin-bottom: govuk-spacing(2);
-
-  @include govuk-font-size($size: 24);
-  @include govuk-typography-weight-bold;
-}
-
-.hmrc-header__service-name--linked {
-  @include govuk-link-style-inverse;
-
-  text-decoration: none;
-
-  &:hover {
-    text-decoration: underline;
-    text-decoration-thickness: $govuk-header-link-underline-thickness;
-
-    @if $govuk-link-underline-offset {
-      text-underline-offset: $govuk-link-underline-offset;
-    }
-  }
-
-  &:focus {
-    @include govuk-focused-text;
   }
 }
 
-// Shift user research banner up 10px to compensate for govuk header border
-// only when adjacent to govuk header
-.hmrc-header + .hmrc-user-research-banner {
-  top: -10px;
-}
-
-// Above style is breaking the user-research-banner when the rebrand is enabled
-.govuk-template--rebranded .hmrc-header + .hmrc-user-research-banner {
-  top: 0;
-}
-
-// Notes on the patches below:
-//
-// use of :has() and :not() is ok because these
-// issues aren't going to be a problem forever
-// because people are migrating to use service
-// navigation to display their service name and
-// navigation items
-
-// the following block of styles makes sure
-// that a service name which spans multiple
-// lines won't cause the sign out link to be
-// displayed under the service name but will
-// be aligned with baseline of its last line
-
-.hmrc-header:has(.hmrc-sign-out-nav):not(:has(.govuk-header__navigation)) {
-  .govuk-header__content {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-align: last baseline;
-        -ms-flex-align: last baseline;
-            align-items: last baseline;
-  }
-
-  .hmrc-sign-out-nav {
-    -ms-flex-negative: 0;
-        flex-shrink: 0;
-    margin-left: auto;
-  }
-}
-
-// the following stops the menu button from sitting
-// immediately to right of service name on smallest
-// screens which looks bad and might be an a11y
-// issue in terms of mobile touch target sizing.
-
-.hmrc-header:has(.govuk-header__navigation) {
-  .govuk-header__service-name {
-    @include govuk-media-query($until: mobile) {
-      float: none;
-    }
-  }
-}