hmrc-frontend 6.2.0 → 6.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. package/govuk-prototype-kit.config.json +1 -1
  2. package/hmrc/VERSION.txt +1 -1
  3. package/hmrc/{accessible-autocomplete-6.2.0.css → accessible-autocomplete-6.4.0.css} +1 -1
  4. package/hmrc/all.js +2 -1
  5. package/hmrc/components/banner/images/hmrc_tudor_crest_18px.png +0 -0
  6. package/hmrc/components/banner/template.njk +28 -13
  7. package/hmrc/components/footer/template.njk +34 -88
  8. package/hmrc/components/header/template.njk +124 -92
  9. package/hmrc/components/internal-header/images/hmrc_tudor_crest_18px_x2.png +0 -0
  10. package/hmrc/components/internal-header/template.njk +29 -14
  11. package/hmrc/components/timeout-dialog/utils.js +2 -1
  12. package/hmrc/govuk/images/favicon.ico +0 -0
  13. package/hmrc/govuk/images/favicon.svg +1 -4
  14. package/hmrc/govuk/images/govuk-icon-180.png +0 -0
  15. package/hmrc/govuk/images/govuk-icon-192.png +0 -0
  16. package/hmrc/govuk/images/govuk-icon-512.png +0 -0
  17. package/hmrc/govuk/images/govuk-icon-mask.svg +1 -3
  18. package/hmrc/govuk/images/govuk-opengraph-image.png +0 -0
  19. package/hmrc/govuk/manifest.json +39 -0
  20. package/hmrc/hmrc-frontend-6.4.0.min.css +4 -0
  21. package/hmrc/hmrc-frontend-6.4.0.min.js +3 -0
  22. package/hmrc/layouts/account-header.html +2 -1
  23. package/hmrc/maps/accessible-autocomplete-6.4.0.css.map +1 -0
  24. package/hmrc/maps/hmrc-frontend-6.4.0.min.css.map +1 -0
  25. package/hmrc/maps/{hmrc-frontend-6.2.0.min.js.map → hmrc-frontend-6.4.0.min.js.map} +1 -1
  26. package/package.json +2 -2
  27. package/hmrc/hmrc-frontend-6.2.0.min.css +0 -4
  28. package/hmrc/hmrc-frontend-6.2.0.min.js +0 -3
  29. package/hmrc/maps/accessible-autocomplete-6.2.0.css.map +0 -1
  30. package/hmrc/maps/hmrc-frontend-6.2.0.min.css.map +0 -1
  31. package/hmrc/vendor/html5shiv.min.js +0 -4
  32. /package/hmrc/{accessible-autocomplete-6.2.0.js → accessible-autocomplete-6.4.0.js} +0 -0
@@ -10,7 +10,7 @@
10
10
  "pluginDependencies": [
11
11
  {
12
12
  "packageName": "govuk-frontend",
13
- "minVersion": "5.0.0"
13
+ "minVersion": "5.2.0"
14
14
  }
15
15
  ],
16
16
  "assets": [
package/hmrc/VERSION.txt CHANGED
@@ -1 +1 @@
1
- 6.2.0
1
+ 6.4.0
@@ -1,2 +1,2 @@
1
1
  .autocomplete__wrapper{position:relative}.autocomplete__hint,.autocomplete__input{-webkit-appearance:none;border:2px solid #0b0c0c;border-radius:0;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;margin-bottom:0;width:100%}.autocomplete__input{background-color:rgba(0,0,0,0);position:relative}.autocomplete__hint{color:#b1b4b6;position:absolute}.autocomplete__input--default{padding:5px}.autocomplete__input--focused{outline:3px solid #fd0;outline-offset:0;-webkit-box-shadow:inset 0 0 0 2px;box-shadow:inset 0 0 0 2px}.autocomplete__input--show-all-values{padding:5px 34px 5px 5px;cursor:pointer}.autocomplete__dropdown-arrow-down{z-index:-1;display:inline-block;position:absolute;right:8px;width:24px;height:24px;top:10px}.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:rgba(0,0,0,.256863) 0 2px 6px;box-shadow:0 2px 6px rgba(0,0,0,.256863);left:0;position:absolute;top:100%;z-index:100}.autocomplete__menu--inline{position:relative}.autocomplete__option{border-left-width:0;border-bottom:1px solid #b1b4b6;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:#fafafa}.autocomplete__option--focused,.autocomplete__option:hover{background-color:#1d70b8;border-color:#1d70b8;color:#fff;outline:0}@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{forced-color-adjust:none;background-color:SelectedItem;border-color:SelectedItem;color:SelectedItemText;outline-color:SelectedItemText}}.autocomplete__option--no-results{background-color:#fafafa;color:#646b6f;cursor:not-allowed}.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:16px;line-height:1.25}.autocomplete__hint,.autocomplete__option{padding:5px}@media (min-width:641px){.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:19px;line-height:1.31579}}.autocomplete__hint,.autocomplete__input,.autocomplete__wrapper{font-family:GDS Transport,arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:1rem;line-height:1.25}@media print{.autocomplete__hint,.autocomplete__input,.autocomplete__wrapper{font-family:sans-serif}}@media (min-width:40.0625em){.autocomplete__hint,.autocomplete__input,.autocomplete__wrapper{font-size:1.1875rem;line-height:1.31579}}@media print{.autocomplete__hint,.autocomplete__input,.autocomplete__wrapper{font-size:14pt;line-height:1.15}}
2
- /*# sourceMappingURL=maps/accessible-autocomplete-6.2.0.css.map */
2
+ /*# sourceMappingURL=maps/accessible-autocomplete-6.4.0.css.map */
package/hmrc/all.js CHANGED
@@ -224,7 +224,8 @@
224
224
  return typeof key === "symbol" ? key : String(key);
225
225
  }
226
226
 
227
- // TODO remove when decision is made by DIAS about removing the timeout dialog functionality for IE
227
+ // TODO Remove the ActiveXObject code and test against Edge
228
+ // Decision agreed with DIAS to remove the timeout dialog functionality for IE)
228
229
  /* global ActiveXObject */
229
230
 
230
231
  var _console = console,
@@ -1,18 +1,33 @@
1
1
  <div class="hmrc-banner">
2
2
  <div class="hmrc-organisation-logo">
3
- <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">
4
- <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" />
5
- <path d="M67.45,71.79a2.39,2.39,0,1,1,0-4.78h0a2.39,2.39,0,0,1,0,4.78Z" />
6
- <path d="M67.47,66a2.28,2.28,0,1,0,0-4.56h0a2.28,2.28,0,0,0,0,4.56Z" />
7
- <path d="M67.45,60.39a2.18,2.18,0,0,1,0-4.35h0a2.18,2.18,0,0,1,0,4.35Z" />
8
- <path d="M67.47,50.17a2,2,0,0,0,0-4.09h0a2,2,0,1,0,0,4.09Z" />
9
- <path d="M67.45,55.13a2.08,2.08,0,0,1,0-4.15h0a2.08,2.08,0,0,1,0,4.15Z" />
10
- <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" />
11
- <path d="M67.47,45.72a5.29,5.29,0,1,0,0-10.57h0a5.29,5.29,0,1,0,0,10.57Z" />
12
- <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" />
13
- <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" />
14
- <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" />
15
- </svg>
3
+ {% if params.useTudorCrown | default(true) %}
4
+ <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">
5
+ <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"/>
6
+ <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"/>
7
+ <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"/>
8
+ <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"/>
9
+ <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"/>
10
+ <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"/>
11
+ <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"/>
12
+ <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"/>
13
+ <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"/>
14
+ <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"/>
15
+ </svg>
16
+ {% else %}
17
+ <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">
18
+ <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" />
19
+ <path d="M67.45,71.79a2.39,2.39,0,1,1,0-4.78h0a2.39,2.39,0,0,1,0,4.78Z" />
20
+ <path d="M67.47,66a2.28,2.28,0,1,0,0-4.56h0a2.28,2.28,0,0,0,0,4.56Z" />
21
+ <path d="M67.45,60.39a2.18,2.18,0,0,1,0-4.35h0a2.18,2.18,0,0,1,0,4.35Z" />
22
+ <path d="M67.47,50.17a2,2,0,0,0,0-4.09h0a2,2,0,1,0,0,4.09Z" />
23
+ <path d="M67.45,55.13a2.08,2.08,0,0,1,0-4.15h0a2.08,2.08,0,0,1,0,4.15Z" />
24
+ <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" />
25
+ <path d="M67.47,45.72a5.29,5.29,0,1,0,0-10.57h0a5.29,5.29,0,1,0,0,10.57Z" />
26
+ <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" />
27
+ <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" />
28
+ <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" />
29
+ </svg>
30
+ {% endif %}
16
31
  <p class="govuk-body-s">{% if params.language == 'cy' %}
17
32
  Cyllid a Thollau EF
18
33
  {% else %}
@@ -1,89 +1,35 @@
1
- <footer class="govuk-footer {{ params.classes if params.classes }}" role="contentinfo"
2
- {%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>
3
- <div class="govuk-width-container {{ params.containerClasses if params.containerClasses }}">
4
- {% if params.navigation | length %}
5
- <div class="govuk-footer__navigation">
6
- {% for nav in params.navigation %}
7
- <div class="govuk-footer__section govuk-grid-column-{{ nav.width | default('full') }}">
8
- <h2 class="govuk-footer__heading govuk-heading-m">{{ nav.title }}</h2>
9
- {% if nav.items | length %}
10
- {% set listClasses %}
11
- {% if nav.columns %}
12
- govuk-footer__list--columns-{{ nav.columns }}
13
- {% endif %}
14
- {% endset %}
15
- <ul class="govuk-footer__list {{ listClasses | trim }}">
16
- {% for item in nav.items %}
17
- {% if item.href and item.text %}
18
- <li class="govuk-footer__list-item">
19
- <a class="govuk-footer__link" href="{{ item.href }}"{% for attribute, value in item.attributes %} {{attribute}}="{{value}}"{% endfor %}>
20
- {{ item.text }}
21
- </a>
22
- </li>
23
- {% endif %}
24
- {% endfor %}
25
- </ul>
26
- {% endif %}
27
- </div>
28
- {% endfor %}
29
- </div>
30
- <hr class="govuk-footer__section-break">
31
- {% endif %}
32
- <div class="govuk-footer__meta">
33
- <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
34
- {% if params.meta %}
35
- {% set supportLinksDefaultText %}{% if params.language == "cy" %}Cysylltiadau cymorth{% else %}Support links{% endif %}{% endset %}
36
- <h2 class="govuk-visually-hidden">{{ params.meta.visuallyHiddenTitle | default(supportLinksDefaultText) }}</h2>
37
- {% if params.meta.items | length %}
38
- <ul class="govuk-footer__inline-list">
39
- {% for item in params.meta.items %}
40
- <li class="govuk-footer__inline-list-item">
41
- <a class="govuk-footer__link" href="{{ item.href }}"{% for attribute, value in item.attributes %} {{attribute}}="{{value}}"{% endfor %}>
42
- {{ item.text }}
43
- </a>
44
- </li>
45
- {% endfor %}
46
- </ul>
47
- {% endif %}
48
- {% if params.meta.text or params.meta.html %}
49
- <div class="govuk-footer__meta-custom">
50
- {{ params.meta.html | safe if params.meta.html else params.meta.text }}
51
- </div>
52
- {% endif %}
53
- {% endif %}
54
- {#- The SVG needs `focusable="false"` so that Internet Explorer does not
55
- treat it as an interactive element - without this it will be
56
- 'focusable' when using the keyboard to navigate. #}
57
- <svg
58
- aria-hidden="true"
59
- focusable="false"
60
- class="govuk-footer__licence-logo"
61
- xmlns="http://www.w3.org/2000/svg"
62
- viewBox="0 0 483.2 195.7"
63
- height="17"
64
- width="41"
65
- >
66
- <path
67
- fill="currentColor"
68
- d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145"
69
- />
70
- </svg>
71
- <span class="govuk-footer__licence-description">
72
- {% if(params.language == 'cy') %}Mae‘r holl gynnwys ar gael o dan {% else %}All content is available under the {% endif %}
73
- <a
74
- class="govuk-footer__link"
75
- href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"
76
- rel="license"
77
- > {% if(params.language == 'cy') %}y Drwydded Llywodraeth Agored{% else %}Open Government Licence{% endif %} v3.0</a>, {% if(params.language == 'cy') %}oni nodir yn wahanol{% else %}except where otherwise stated{% endif %}
1
+ {% from "govuk/components/footer/macro.njk" import govukFooter %}
78
2
 
79
- </span>
80
- </div>
81
- <div class="govuk-footer__meta-item">
82
- <a
83
- class="govuk-footer__link govuk-footer__copyright-logo"
84
- href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/"
85
- {% if(params.language == 'cy') %}Hawlfraint y Goron{% else %}Crown copyright{% endif %}</a>
86
- </div>
87
- </div>
88
- </div>
89
- </footer>
3
+ {% set contentLicenceHtml -%}
4
+ {% if(params.language == 'cy') %}Mae‘r holl gynnwys ar gael o dan {% else %}All content is available under the {% endif %}
5
+ <a
6
+ class="govuk-footer__link"
7
+ href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"
8
+ rel="license"
9
+ >{% if(params.language == 'cy') %}y Drwydded Llywodraeth Agored{% else %}Open Government Licence{% endif %} v3.0</a>, {% if(params.language == 'cy') %}oni nodir yn wahanol{% else %}except where otherwise stated{% endif %}
10
+ {%- endset %}
11
+
12
+ {% set copyrightHtml -%}
13
+ © {% if(params.language == 'cy') %}Hawlfraint y Goron{% else %}Crown copyright{% endif %}
14
+ {%- endset %}
15
+
16
+ {% set defaultMetaVisuallyHiddenTitle = "Cysylltiadau cymorth" if params.language == "cy" else "Support links" %}
17
+
18
+ {{ govukFooter({
19
+ meta: {
20
+ visuallyHiddenTitle: params.meta.visuallyHiddenTitle | default(defaultMetaVisuallyHiddenTitle),
21
+ html: params.meta.html,
22
+ text: params.meta.text,
23
+ items: params.meta.items
24
+ } if params.meta,
25
+ navigation: params.navigation,
26
+ contentLicence: {
27
+ html: contentLicenceHtml
28
+ },
29
+ copyright: {
30
+ html: copyrightHtml
31
+ },
32
+ containerClasses: params.containerClasses,
33
+ classes: params.classes,
34
+ attributes: params.attributes
35
+ }) }}
@@ -1,105 +1,137 @@
1
1
  {% set language = params.language | default('en') %}
2
2
  {% from "../banner/macro.njk" import hmrcBanner %}
3
3
  {% from "../user-research-banner/macro.njk" import hmrcUserResearchBanner %}
4
- {% from "govuk/components/phase-banner/macro.njk" import govukPhaseBanner %}
4
+ {% from "govuk/components/phase-banner/macro.njk" import govukPhaseBanner %}
5
+
6
+ {% from "govuk/macros/attributes.njk" import govukAttributes %}
7
+
8
+ {%- set menuButtonText = 'Dewislen' if language == 'cy' else 'Menu' -%}
9
+
10
+ {%- set _stEdwardsCrown %}
11
+ <svg
12
+ focusable="false"
13
+ role="img"
14
+ class="govuk-header__logotype"
15
+ xmlns="http://www.w3.org/2000/svg"
16
+ viewBox="0 0 152 30"
17
+ height="30"
18
+ width="152"
19
+ aria-label="GOV.UK"
20
+ >
21
+ <title>GOV.UK</title>
22
+ <path d="M6.7 12.2c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1-.4 1 0 2.1 1 2.5m-4.3 2.5c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1-.5 1 0 2.1 1 2.5m-1.3 4.8c1 .4 2.1-.1 2.5-1 .4-1-.1-2.1-1-2.5-1-.4-2.1.1-2.5 1-.4 1 0 2.1 1 2.5m10.4-5.8c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1s0 2.1 1 2.5m17.4-1.5c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1 .5 1 0 2.1-1 2.5m4.3 2.5c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1 .5 1 0 2.1-1 2.5m1.3 4.8c-1 .4-2.1-.1-2.5-1-.4-1 .1-2.1 1-2.5 1-.4 2.1.1 2.5 1 .4 1 0 2.1-1 2.5m-10.4-5.8c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1s0 2.1-1 2.5m-5.3-4.9 2.4 1.3V6.5l-2.4.8c-.1-.1-.1-.2-.2-.2s1-3 1-3h-3.4l1 3c-.1.1-.2.1-.2.2-.1.1-2.4-.7-2.4-.7v3.5L17 8.8c-.1.1 0 .2.1.3l-1.4 4.2c-.1.2-.1.4-.1.7 0 1.1.8 2.1 1.9 2.2h.6C19.2 16 20 15.1 20 14c0-.2 0-.4-.1-.7l-1.4-4.2c.2-.1.3-.2.3-.3m-1 20.3c4.6 0 8.9.3 12.8.9 1.1-4.6 2.4-7.2 3.8-9.1l-2.6-.9c.3 1.3.3 1.9 0 2.8-.4-.4-.8-1.2-1.1-2.4l-1.2 4.2c.8-.5 1.4-.9 2-.9-1.2 2.6-2.7 3.2-3.6 3-1.2-.2-1.7-1.3-1.5-2.2.3-1.3 1.6-1.6 2.2-.1 1.2-2.4-.8-3.1-2.1-2.4 1.9-1.9 2.2-3.6.6-5.7-2.2 1.7-2.2 3.3-1.2 5.6-1.3-1.5-3.3-.7-2.5 1.7.9-1.4 2.1-.5 2 .8-.2 1.2-1.7 2.1-3.7 2-2.8-.2-3-2.2-3-3.7.7-.1 1.9.5 3 2l.4-4.4c-1.1 1.2-2.2 1.4-3.3 1.4.4-1.2 2.1-3.1 2.1-3.1h-5.5s1.8 2 2.1 3.1c-1.1 0-2.2-.3-3.3-1.4l.4 4.4c1.1-1.5 2.3-2.1 3-2-.1 1.6-.2 3.5-3 3.7-1.9.2-3.5-.8-3.7-2-.2-1.3 1-2.2 1.9-.8.7-2.4-1.3-3.1-2.6-1.7 1-2.3 1-4-1.2-5.6-1.6 2.1-1.3 3.8.6 5.7-1.3-.7-3.2 0-2.1 2.4.6-1.5 1.9-1.1 2.2.1.2.9-.4 1.9-1.5 2.2-1 .2-2.5-.5-3.7-3 .7 0 1.3.4 2 .9L5 20.4c-.3 1.2-.7 1.9-1.2 2.4-.3-.8-.2-1.5 0-2.8l-2.6.9C2.7 22.8 4 25.4 5.1 30c3.8-.5 8.2-.9 12.7-.9m30.5-11.5c0 .9.1 1.7.3 2.5.2.8.6 1.5 1 2.2.5.6 1 1.1 1.7 1.5.7.4 1.5.6 2.5.6.9 0 1.7-.1 2.3-.4s1.1-.7 1.5-1.1c.4-.4.6-.9.8-1.5.1-.5.2-1 .2-1.5v-.2h-5.3v-3.2h9.4V28H59v-2.5c-.3.4-.6.8-1 1.1-.4.3-.8.6-1.3.9-.5.2-1 .4-1.6.6s-1.2.2-1.8.2c-1.5 0-2.9-.3-4-.8-1.2-.6-2.2-1.3-3-2.3-.8-1-1.4-2.1-1.8-3.4-.3-1.4-.5-2.8-.5-4.3s.2-2.9.7-4.2c.5-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.6 2.6-.8 4.1-.8 1 0 1.9.1 2.8.3.9.2 1.7.6 2.4 1s1.4.9 1.9 1.5c.6.6 1 1.3 1.4 2l-3.7 2.1c-.2-.4-.5-.9-.8-1.2-.3-.4-.6-.7-1-1-.4-.3-.8-.5-1.3-.7-.5-.2-1.1-.2-1.7-.2-1 0-1.8.2-2.5.6-.7.4-1.3.9-1.7 1.5-.5.6-.8 1.4-1 2.2-.3.8-.4 1.9-.4 2.7zm36.4-4.3c-.4-1.3-1.1-2.4-2-3.4-.9-1-1.9-1.7-3.1-2.3-1.2-.6-2.6-.8-4.2-.8s-2.9.3-4.2.8c-1.1.6-2.2 1.4-3 2.3-.9 1-1.5 2.1-2 3.4-.4 1.3-.7 2.7-.7 4.2s.2 2.9.7 4.2c.4 1.3 1.1 2.4 2 3.4.9 1 1.9 1.7 3.1 2.3 1.2.6 2.6.8 4.2.8 1.5 0 2.9-.3 4.2-.8 1.2-.6 2.3-1.3 3.1-2.3.9-1 1.5-2.1 2-3.4.4-1.3.7-2.7.7-4.2-.1-1.5-.3-2.9-.8-4.2zM81 17.6c0 1-.1 1.9-.4 2.7-.2.8-.6 1.6-1.1 2.2-.5.6-1.1 1.1-1.7 1.4-.7.3-1.5.5-2.4.5-.9 0-1.7-.2-2.4-.5s-1.3-.8-1.7-1.4c-.5-.6-.8-1.3-1.1-2.2-.2-.8-.4-1.7-.4-2.7v-.1c0-1 .1-1.9.4-2.7.2-.8.6-1.6 1.1-2.2.5-.6 1.1-1.1 1.7-1.4.7-.3 1.5-.5 2.4-.5.9 0 1.7.2 2.4.5s1.3.8 1.7 1.4c.5.6.8 1.3 1.1 2.2.2.8.4 1.7.4 2.7v.1zM92.9 28 87 7h4.7l4 15.7h.1l4-15.7h4.7l-5.9 21h-5.7zm28.8-3.6c.6 0 1.2-.1 1.7-.3.5-.2 1-.4 1.4-.8.4-.4.7-.8.9-1.4.2-.6.3-1.2.3-2v-13h4.1v13.6c0 1.2-.2 2.2-.6 3.1s-1 1.7-1.8 2.4c-.7.7-1.6 1.2-2.7 1.5-1 .4-2.2.5-3.4.5-1.2 0-2.4-.2-3.4-.5-1-.4-1.9-.9-2.7-1.5-.8-.7-1.3-1.5-1.8-2.4-.4-.9-.6-2-.6-3.1V6.9h4.2v13c0 .8.1 1.4.3 2 .2.6.5 1 .9 1.4.4.4.8.6 1.4.8.6.2 1.1.3 1.8.3zm13-17.4h4.2v9.1l7.4-9.1h5.2l-7.2 8.4L152 28h-4.9l-5.5-9.4-2.7 3V28h-4.2V7zm-27.6 16.1c-1.5 0-2.7 1.2-2.7 2.7s1.2 2.7 2.7 2.7 2.7-1.2 2.7-2.7-1.2-2.7-2.7-2.7z"></path>
23
+ </svg>
24
+ {% endset %}
25
+
26
+ {%- set _tudorCrown %}
27
+ <svg
28
+ focusable="false"
29
+ role="img"
30
+ class="govuk-header__logotype"
31
+ xmlns="http://www.w3.org/2000/svg"
32
+ viewBox="0 0 148 30"
33
+ height="30"
34
+ width="148"
35
+ aria-label="GOV.UK"
36
+ >
37
+ <title>GOV.UK</title>
38
+ <path d="M22.6 10.4c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m-5.9 6.7c-.9.4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m10.8-3.7c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s0 2-1 2.4m3.3 4.8c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4M17 4.7l2.3 1.2V2.5l-2.3.7-.2-.2.9-3h-3.4l.9 3-.2.2c-.1.1-2.3-.7-2.3-.7v3.4L15 4.7c.1.1.1.2.2.2l-1.3 4c-.1.2-.1.4-.1.6 0 1.1.8 2 1.9 2.2h.7c1-.2 1.9-1.1 1.9-2.1 0-.2 0-.4-.1-.6l-1.3-4c-.1-.2 0-.2.1-.3m-7.6 5.7c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m-5 3c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s.1 2 1 2.4m-3.2 4.8c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m14.8 11c4.4 0 8.6.3 12.3.8 1.1-4.5 2.4-7 3.7-8.8l-2.5-.9c.2 1.3.3 1.9 0 2.7-.4-.4-.8-1.1-1.1-2.3l-1.2 4c.7-.5 1.3-.8 2-.9-1.1 2.5-2.6 3.1-3.5 3-1.1-.2-1.7-1.2-1.5-2.1.3-1.2 1.5-1.5 2.1-.1 1.1-2.3-.8-3-2-2.3 1.9-1.9 2.1-3.5.6-5.6-2.1 1.6-2.1 3.2-1.2 5.5-1.2-1.4-3.2-.6-2.5 1.6.9-1.4 2.1-.5 1.9.8-.2 1.1-1.7 2.1-3.5 1.9-2.7-.2-2.9-2.1-2.9-3.6.7-.1 1.9.5 2.9 1.9l.4-4.3c-1.1 1.1-2.1 1.4-3.2 1.4.4-1.2 2.1-3 2.1-3h-5.4s1.7 1.9 2.1 3c-1.1 0-2.1-.2-3.2-1.4l.4 4.3c1-1.4 2.2-2 2.9-1.9-.1 1.5-.2 3.4-2.9 3.6-1.9.2-3.4-.8-3.5-1.9-.2-1.3 1-2.2 1.9-.8.7-2.3-1.2-3-2.5-1.6.9-2.2.9-3.9-1.2-5.5-1.5 2-1.3 3.7.6 5.6-1.2-.7-3.1 0-2 2.3.6-1.4 1.8-1.1 2.1.1.2.9-.3 1.9-1.5 2.1-.9.2-2.4-.5-3.5-3 .6 0 1.2.3 2 .9l-1.2-4c-.3 1.1-.7 1.9-1.1 2.3-.3-.8-.2-1.4 0-2.7l-2.9.9C1.3 23 2.6 25.5 3.7 30c3.7-.5 7.9-.8 12.3-.8m28.3-11.6c0 .9.1 1.7.3 2.5.2.8.6 1.5 1 2.2.5.6 1 1.1 1.7 1.5.7.4 1.5.6 2.5.6.9 0 1.7-.1 2.3-.4s1.1-.7 1.5-1.1c.4-.4.6-.9.8-1.5.1-.5.2-1 .2-1.5v-.2h-5.3v-3.2h9.4V28H55v-2.5c-.3.4-.6.8-1 1.1-.4.3-.8.6-1.3.9-.5.2-1 .4-1.6.6s-1.2.2-1.8.2c-1.5 0-2.9-.3-4-.8-1.2-.6-2.2-1.3-3-2.3-.8-1-1.4-2.1-1.8-3.4-.3-1.4-.5-2.8-.5-4.3s.2-2.9.7-4.2c.5-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.6 2.6-.8 4.1-.8 1 0 1.9.1 2.8.3.9.2 1.7.6 2.4 1s1.4.9 1.9 1.5c.6.6 1 1.3 1.4 2l-3.7 2.1c-.2-.4-.5-.9-.8-1.2-.3-.4-.6-.7-1-1-.4-.3-.8-.5-1.3-.7-.5-.2-1.1-.2-1.7-.2-1 0-1.8.2-2.5.6-.7.4-1.3.9-1.7 1.5-.5.6-.8 1.4-1 2.2-.3.8-.4 1.9-.4 2.7zM71.5 6.8c1.5 0 2.9.3 4.2.8 1.2.6 2.3 1.3 3.1 2.3.9 1 1.5 2.1 2 3.4s.7 2.7.7 4.2-.2 2.9-.7 4.2c-.4 1.3-1.1 2.4-2 3.4-.9 1-1.9 1.7-3.1 2.3-1.2.6-2.6.8-4.2.8s-2.9-.3-4.2-.8c-1.2-.6-2.3-1.3-3.1-2.3-.9-1-1.5-2.1-2-3.4-.4-1.3-.7-2.7-.7-4.2s.2-2.9.7-4.2c.4-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.5 2.6-.8 4.2-.8zm0 17.6c.9 0 1.7-.2 2.4-.5s1.3-.8 1.7-1.4c.5-.6.8-1.3 1.1-2.2.2-.8.4-1.7.4-2.7v-.1c0-1-.1-1.9-.4-2.7-.2-.8-.6-1.6-1.1-2.2-.5-.6-1.1-1.1-1.7-1.4-.7-.3-1.5-.5-2.4-.5s-1.7.2-2.4.5-1.3.8-1.7 1.4c-.5.6-.8 1.3-1.1 2.2-.2.8-.4 1.7-.4 2.7v.1c0 1 .1 1.9.4 2.7.2.8.6 1.6 1.1 2.2.5.6 1.1 1.1 1.7 1.4.6.3 1.4.5 2.4.5zM88.9 28 83 7h4.7l4 15.7h.1l4-15.7h4.7l-5.9 21h-5.7zm28.8-3.6c.6 0 1.2-.1 1.7-.3.5-.2 1-.4 1.4-.8.4-.4.7-.8.9-1.4.2-.6.3-1.2.3-2v-13h4.1v13.6c0 1.2-.2 2.2-.6 3.1s-1 1.7-1.8 2.4c-.7.7-1.6 1.2-2.7 1.5-1 .4-2.2.5-3.4.5-1.2 0-2.4-.2-3.4-.5-1-.4-1.9-.9-2.7-1.5-.8-.7-1.3-1.5-1.8-2.4-.4-.9-.6-2-.6-3.1V6.9h4.2v13c0 .8.1 1.4.3 2 .2.6.5 1 .9 1.4.4.4.8.6 1.4.8.6.2 1.1.3 1.8.3zm13-17.4h4.2v9.1l7.4-9.1h5.2l-7.2 8.4L148 28h-4.9l-5.5-9.4-2.7 3V28h-4.2V7zm-27.6 16.1c-1.5 0-2.7 1.2-2.7 2.7s1.2 2.7 2.7 2.7 2.7-1.2 2.7-2.7-1.2-2.7-2.7-2.7z"></path>
39
+ </svg>
40
+ {% endset -%}
5
41
 
6
42
  <header role="banner">
7
- <div class="govuk-header hmrc-header {{ params.classes if params.classes }} {{ 'hmrc-header--with-additional-navigation' if params.signOutHref or params.languageToggle }}" data-module="govuk-header"
8
- {%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>
9
- <div class="govuk-header__container {{ params.containerClasses | default('govuk-width-container') }}">
10
- <div class="govuk-header__logo">
11
- <a href="{{ params.homepageUrl | default('/') }}" class="govuk-header__link govuk-header__link--homepage">
12
- {#- The SVG needs `focusable="false"` so that Internet Explorer does
13
- not treat it as an interactive element - without this it will be
14
- 'focusable' when using the keyboard to navigate.
43
+ <div class="govuk-header hmrc-header {%- if params.classes %} {{ params.classes }}{% endif %}{{ ' hmrc-header--with-additional-navigation' if params.signOutHref or params.languageToggle }}" data-module="govuk-header"
44
+ {{- govukAttributes(params.attributes) }}>
45
+ <div class="govuk-header__container {{ params.containerClasses | default("govuk-width-container", true) }}">
46
+ <div class="govuk-header__logo">
47
+ <a href="{{ params.homepageUrl | default("/", true) }}" class="govuk-header__link govuk-header__link--homepage">
48
+ {#- The SVG needs `focusable="false"` so that Internet Explorer does
49
+ not treat it as an interactive element - without this it will be
50
+ 'focusable' when using the keyboard to navigate.
15
51
 
16
- We use a single compound path for the logo to prevent subpixel rounding
17
- shifting different elements unevenly relative to one another. #}
18
- <svg
19
- focusable="false"
20
- role="img"
21
- class="govuk-header__logotype"
22
- xmlns="http://www.w3.org/2000/svg"
23
- viewBox="0 0 152 30"
24
- height="30"
25
- width="152"
26
- aria-label="GOV.UK"
27
- >
28
- <title>GOV.UK</title>
29
- <path d="M6.7 12.2c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1-.4 1 0 2.1 1 2.5m-4.3 2.5c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1-.5 1 0 2.1 1 2.5m-1.3 4.8c1 .4 2.1-.1 2.5-1 .4-1-.1-2.1-1-2.5-1-.4-2.1.1-2.5 1-.4 1 0 2.1 1 2.5m10.4-5.8c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1s0 2.1 1 2.5m17.4-1.5c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1 .5 1 0 2.1-1 2.5m4.3 2.5c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1 .5 1 0 2.1-1 2.5m1.3 4.8c-1 .4-2.1-.1-2.5-1-.4-1 .1-2.1 1-2.5 1-.4 2.1.1 2.5 1 .4 1 0 2.1-1 2.5m-10.4-5.8c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1s0 2.1-1 2.5m-5.3-4.9 2.4 1.3V6.5l-2.4.8c-.1-.1-.1-.2-.2-.2s1-3 1-3h-3.4l1 3c-.1.1-.2.1-.2.2-.1.1-2.4-.7-2.4-.7v3.5L17 8.8c-.1.1 0 .2.1.3l-1.4 4.2c-.1.2-.1.4-.1.7 0 1.1.8 2.1 1.9 2.2h.6C19.2 16 20 15.1 20 14c0-.2 0-.4-.1-.7l-1.4-4.2c.2-.1.3-.2.3-.3m-1 20.3c4.6 0 8.9.3 12.8.9 1.1-4.6 2.4-7.2 3.8-9.1l-2.6-.9c.3 1.3.3 1.9 0 2.8-.4-.4-.8-1.2-1.1-2.4l-1.2 4.2c.8-.5 1.4-.9 2-.9-1.2 2.6-2.7 3.2-3.6 3-1.2-.2-1.7-1.3-1.5-2.2.3-1.3 1.6-1.6 2.2-.1 1.2-2.4-.8-3.1-2.1-2.4 1.9-1.9 2.2-3.6.6-5.7-2.2 1.7-2.2 3.3-1.2 5.6-1.3-1.5-3.3-.7-2.5 1.7.9-1.4 2.1-.5 2 .8-.2 1.2-1.7 2.1-3.7 2-2.8-.2-3-2.2-3-3.7.7-.1 1.9.5 3 2l.4-4.4c-1.1 1.2-2.2 1.4-3.3 1.4.4-1.2 2.1-3.1 2.1-3.1h-5.5s1.8 2 2.1 3.1c-1.1 0-2.2-.3-3.3-1.4l.4 4.4c1.1-1.5 2.3-2.1 3-2-.1 1.6-.2 3.5-3 3.7-1.9.2-3.5-.8-3.7-2-.2-1.3 1-2.2 1.9-.8.7-2.4-1.3-3.1-2.6-1.7 1-2.3 1-4-1.2-5.6-1.6 2.1-1.3 3.8.6 5.7-1.3-.7-3.2 0-2.1 2.4.6-1.5 1.9-1.1 2.2.1.2.9-.4 1.9-1.5 2.2-1 .2-2.5-.5-3.7-3 .7 0 1.3.4 2 .9L5 20.4c-.3 1.2-.7 1.9-1.2 2.4-.3-.8-.2-1.5 0-2.8l-2.6.9C2.7 22.8 4 25.4 5.1 30c3.8-.5 8.2-.9 12.7-.9m30.5-11.5c0 .9.1 1.7.3 2.5.2.8.6 1.5 1 2.2.5.6 1 1.1 1.7 1.5.7.4 1.5.6 2.5.6.9 0 1.7-.1 2.3-.4s1.1-.7 1.5-1.1c.4-.4.6-.9.8-1.5.1-.5.2-1 .2-1.5v-.2h-5.3v-3.2h9.4V28H59v-2.5c-.3.4-.6.8-1 1.1-.4.3-.8.6-1.3.9-.5.2-1 .4-1.6.6s-1.2.2-1.8.2c-1.5 0-2.9-.3-4-.8-1.2-.6-2.2-1.3-3-2.3-.8-1-1.4-2.1-1.8-3.4-.3-1.4-.5-2.8-.5-4.3s.2-2.9.7-4.2c.5-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.6 2.6-.8 4.1-.8 1 0 1.9.1 2.8.3.9.2 1.7.6 2.4 1s1.4.9 1.9 1.5c.6.6 1 1.3 1.4 2l-3.7 2.1c-.2-.4-.5-.9-.8-1.2-.3-.4-.6-.7-1-1-.4-.3-.8-.5-1.3-.7-.5-.2-1.1-.2-1.7-.2-1 0-1.8.2-2.5.6-.7.4-1.3.9-1.7 1.5-.5.6-.8 1.4-1 2.2-.3.8-.4 1.9-.4 2.7zm36.4-4.3c-.4-1.3-1.1-2.4-2-3.4-.9-1-1.9-1.7-3.1-2.3-1.2-.6-2.6-.8-4.2-.8s-2.9.3-4.2.8c-1.1.6-2.2 1.4-3 2.3-.9 1-1.5 2.1-2 3.4-.4 1.3-.7 2.7-.7 4.2s.2 2.9.7 4.2c.4 1.3 1.1 2.4 2 3.4.9 1 1.9 1.7 3.1 2.3 1.2.6 2.6.8 4.2.8 1.5 0 2.9-.3 4.2-.8 1.2-.6 2.3-1.3 3.1-2.3.9-1 1.5-2.1 2-3.4.4-1.3.7-2.7.7-4.2-.1-1.5-.3-2.9-.8-4.2zM81 17.6c0 1-.1 1.9-.4 2.7-.2.8-.6 1.6-1.1 2.2-.5.6-1.1 1.1-1.7 1.4-.7.3-1.5.5-2.4.5-.9 0-1.7-.2-2.4-.5s-1.3-.8-1.7-1.4c-.5-.6-.8-1.3-1.1-2.2-.2-.8-.4-1.7-.4-2.7v-.1c0-1 .1-1.9.4-2.7.2-.8.6-1.6 1.1-2.2.5-.6 1.1-1.1 1.7-1.4.7-.3 1.5-.5 2.4-.5.9 0 1.7.2 2.4.5s1.3.8 1.7 1.4c.5.6.8 1.3 1.1 2.2.2.8.4 1.7.4 2.7v.1zM92.9 28 87 7h4.7l4 15.7h.1l4-15.7h4.7l-5.9 21h-5.7zm28.8-3.6c.6 0 1.2-.1 1.7-.3.5-.2 1-.4 1.4-.8.4-.4.7-.8.9-1.4.2-.6.3-1.2.3-2v-13h4.1v13.6c0 1.2-.2 2.2-.6 3.1s-1 1.7-1.8 2.4c-.7.7-1.6 1.2-2.7 1.5-1 .4-2.2.5-3.4.5-1.2 0-2.4-.2-3.4-.5-1-.4-1.9-.9-2.7-1.5-.8-.7-1.3-1.5-1.8-2.4-.4-.9-.6-2-.6-3.1V6.9h4.2v13c0 .8.1 1.4.3 2 .2.6.5 1 .9 1.4.4.4.8.6 1.4.8.6.2 1.1.3 1.8.3zm13-17.4h4.2v9.1l7.4-9.1h5.2l-7.2 8.4L152 28h-4.9l-5.5-9.4-2.7 3V28h-4.2V7zm-27.6 16.1c-1.5 0-2.7 1.2-2.7 2.7s1.2 2.7 2.7 2.7 2.7-1.2 2.7-2.7-1.2-2.7-2.7-2.7z"></path>
30
- </svg>
31
- {% if (params.productName) %}
32
- <span class="govuk-header__product-name">
33
- {{ params.productName }}
34
- </span>
35
- {% endif %}
36
- </a>
37
- </div>
38
- {% if params.serviceName or params.navigation | length or params.signOutHref or params.languageToggle %}
39
- <div class="govuk-header__content">
40
- {% if params.serviceName %}
41
- {% set serviceNameTag = 'a' if params.serviceUrl else 'span' %}
42
- <{{ serviceNameTag }} {% if (serviceNameTag == 'a') %}href="{{ params.serviceUrl }}" {% endif %} class="hmrc-header__service-name {% if (serviceNameTag == 'a') %}hmrc-header__service-name--linked{% endif %}">
43
- {{ params.serviceName }}
44
- </{{ serviceNameTag }}>
52
+ We use a single compound path for the logo to prevent subpixel rounding
53
+ shifting different elements unevenly relative to one another. #}
54
+ {{ (_stEdwardsCrown if (params.useTudorCrown !== undefined and params.useTudorCrown === false) else _tudorCrown) | safe | trim | indent(8) }}
55
+ {% if (params.productName) %}
56
+ <span class="govuk-header__product-name">
57
+ {{ params.productName }}
58
+ </span>
59
+ {% endif %}
60
+ </a>
61
+ </div>
62
+ {% if params.serviceName or params.navigation | length or params.signOutHref or params.languageToggle %}
63
+ <div class="govuk-header__content">
64
+ {% if params.serviceName %}
65
+ {% if params.serviceUrl %}
66
+ <a href="{{ params.serviceUrl }}" class="govuk-header__link govuk-header__service-name hmrc-header__service-name hmrc-header__service-name--linked">
67
+ {{ params.serviceName }}
68
+ </a>
69
+ {% else %}
70
+ <span class="govuk-header__service-name hmrc-header__service-name">
71
+ {{ params.serviceName }}
72
+ </span>
45
73
  {% endif %}
46
- {% if params.navigation | length %}
47
- <nav class="govuk-header__navigation" aria-label="{% if language == 'cy' %}Dewislen Lefel Uchaf{% else %}Top Level Menu{% endif %}">
48
- <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" aria-label="{% if language == 'cy' %}Dangos neu guddio’r Ddewislen Lefel Uchaf{% else %}Show or hide Top Level Menu{% endif %}" hidden>{% if language == 'cy' %}Dewislen{% else %}Menu{% endif %}</button>
49
- <ul id="navigation" class="govuk-header__navigation-list{{ (' ' + params.navigationClasses) if params.navigationClasses }}">
50
- {% for item in params.navigation %}
51
- {% if item.text or item.html %}
52
- <li class="govuk-header__navigation-item{{ ' govuk-header__navigation-item--active' if item.active }}">
53
- {% if item.href %}
54
- <a class="govuk-header__link" href="{{ item.href }}"{% for attribute, value in item.attributes %} {{attribute}}="{{value}}"{% endfor %}>
55
- {% endif %}
56
- {{ item.html | safe if item.html else item.text }}
57
- {% if item.href %}
58
- </a>
59
- {% endif %}
60
- </li>
74
+ {% endif %}
75
+ {% if params.navigation | length %}
76
+ <nav aria-label="{{ params.navigationLabel | default(menuButtonText, true) }}" class="govuk-header__navigation {%- if params.navigationClasses %} {{ params.navigationClasses }}{% endif %}">
77
+ <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>
78
+ {{ menuButtonText }}
79
+ </button>
80
+
81
+ <ul id="navigation" class="govuk-header__navigation-list">
82
+ {% for item in params.navigation %}
83
+ {% if item.text or item.html %}
84
+ <li class="govuk-header__navigation-item {%- if item.active %} govuk-header__navigation-item--active{% endif %}">
85
+ {% if item.href %}
86
+ <a class="govuk-header__link" href="{{ item.href }}"
87
+ {{- govukAttributes(item.attributes) -}}>
88
+ {% endif %}
89
+ {{ item.html | safe | trim | indent(14) if item.html else item.text }}
90
+ {% if item.href %}
91
+ </a>
61
92
  {% endif %}
62
- {% endfor %}
93
+ </li>
94
+ {% endif %}
95
+ {% endfor %}
63
96
  </ul>
64
97
  </nav>
65
- {% endif %}
66
-
67
- {% if params.signOutHref %}
68
- <nav class="hmrc-sign-out-nav">
69
- <a class="govuk-link hmrc-sign-out-nav__link" href="{{ params.signOutHref }}">
70
- {% if language == 'cy' %}Allgofnodi{% else %}Sign out{% endif %}
71
- </a>
72
- </nav>
73
- {% elseif params.languageToggle %}
74
- <nav class="hmrc-language-select" aria-label="Choose a language">
75
- <ul class="govuk-list hmrc-language-select__items">
76
- <li class="govuk-header__navigation-item">
77
- <a{% if language == 'en' %} aria-current="page"{% else %} class="govuk-header__link"{% endif %}
78
- lang="en" hreflang="en" href="{{ params.languageToggle.en.href }}">English</a>
79
- </li>
80
- <li class="govuk-header__navigation-item">
81
- <a {% if language == 'cy' %} aria-current="page"{% else %} class="govuk-header__link"{% endif %}
82
- lang="cy" hreflang="cy" href="{{ params.languageToggle.cy.href }}">Cymraeg</a>
83
- </li>
84
- </ul>
85
- </nav>
86
- {% endif %}
87
- </div>
88
- {% endif %}
89
- </div>
90
- </div>
91
- {% if params.phaseBanner %}
92
- <div class="govuk-width-container">
93
- {{ govukPhaseBanner(params.phaseBanner) }}
94
- </div>
95
- {% endif %}
96
- {% if params.userResearchBanner %}
97
- {{ hmrcUserResearchBanner({language: params.language, url: params.userResearchBanner.url }) }}
98
- {% endif %}
99
- {% if params.displayHmrcBanner %}
100
- <div class="govuk-width-container">
101
- {{ hmrcBanner({language: params.language}) }}
98
+ {% endif %}
99
+ {% if params.signOutHref %}
100
+ <nav class="hmrc-sign-out-nav">
101
+ <a class="govuk-link hmrc-sign-out-nav__link" href="{{ params.signOutHref }}">
102
+ {% if language == 'cy' %}Allgofnodi{% else %}Sign out{% endif %}
103
+ </a>
104
+ </nav>
105
+ {% elseif params.languageToggle %}{# TODO should this really be elseif? #}
106
+ <nav class="hmrc-language-select" aria-label="Choose a language">{# TODO we should be translating this #}
107
+ <ul class="govuk-list hmrc-language-select__items">
108
+ <li class="govuk-header__navigation-item">
109
+ <a{% if language == 'en' %} aria-current="page"{% else %} class="govuk-header__link"{% endif %}
110
+ lang="en" hreflang="en" href="{{ params.languageToggle.en.href }}">English</a>
111
+ </li>
112
+ <li class="govuk-header__navigation-item">
113
+ <a {% if language == 'cy' %} aria-current="page"{% else %} class="govuk-header__link"{% endif %}
114
+ lang="cy" hreflang="cy" href="{{ params.languageToggle.cy.href }}">Cymraeg</a>
115
+ </li>
116
+ </ul>
117
+ </nav>
118
+ {% endif %}
102
119
  </div>
103
120
  {% endif %}
104
- {{ params.additionalBannersBlock | safe }}
121
+ </div>
122
+ </div>
123
+ {%- if params.phaseBanner %}
124
+ <div class="govuk-width-container">
125
+ {{ govukPhaseBanner(params.phaseBanner) }}
126
+ </div>
127
+ {% endif %}
128
+ {%- if params.userResearchBanner %}
129
+ {{ hmrcUserResearchBanner({language: params.language, url: params.userResearchBanner.url }) }}
130
+ {% endif %}
131
+ {%- if params.displayHmrcBanner %}
132
+ <div class="govuk-width-container">
133
+ {{ hmrcBanner({language: params.language, useTudorCrown: params.useTudorCrown}) }}
134
+ </div>
135
+ {% endif %}
136
+ {{- params.additionalBannersBlock | safe }}
105
137
  </header>