Spike increase spacing in logo to 2.5 dots

Author: querkmachine

packages/govuk-frontend/src/govuk/macros/logo.jsdom.test.js

@@ -186,7 +186,7 @@ describe('logo.njk', () => {
     })
 
     it('forces use of the Tudor Crown if `rebrand` is true', () => {
-      expect($svg).toHaveAttribute('viewBox', '0 0 159 30')
+      expect($svg).toHaveAttribute('viewBox', '0 0 162 30')
     })
   })
 })

packages/govuk-frontend/src/govuk/macros/logo.njk

@@ -16,7 +16,7 @@ releases of Frontend. #}
   {#- Calculate how wide the logo needs to be for the given parameters. #}
   {%- set svgWidth = 32 if useTudorCrown else 36 %}
   {%- set svgWidth = svgWidth + 116 if (useLogotype and not rebrand) else svgWidth %}
-  {%- set svgWidth = svgWidth + 127 if (useLogotype and rebrand) else svgWidth %}
+  {%- set svgWidth = svgWidth + 130 if (useLogotype and rebrand) else svgWidth %}
 
   {#- Charles III's Tudor Crown icon has been the default since February 2024. #}
   {%- set _tudorCrown %}
@@ -50,8 +50,8 @@ releases of Frontend. #}
   use alongide the Tudor Crown, so don't bother with offsetting for the
   St. Edward's Crown. #}
   {%- set _dotLogotype %}
-    <circle class="govuk-logo-dot" cx="109.81" cy="17.83" r="3.7"></circle>
-    <path d="m43.61,17.93c0,.9.1,1.8.3,2.7s.6,1.6,1.1,2.3c.5.7,1.1,1.2,1.8,1.6s1.6.6,2.6.6,1.8-.2,2.4-.5c.7-.3,1.2-.7,1.6-1.2.4-.5.7-1,.8-1.5s.2-1,.2-1.5v-.2h-5.5v-3.3h9.8v12h-3.8v-2.7c-.3.4-.6.8-1,1.2-.4.4-.9.6-1.4.9-.5.2-1.1.4-1.7.6s-1.2.2-1.9.2c-1.6,0-3-.3-4.2-.9s-2.3-1.4-3.1-2.4-1.5-2.2-1.9-3.5-.7-2.8-.7-4.4.2-3,.7-4.4,1.2-2.5,2.1-3.5,2-1.8,3.3-2.4,2.7-.9,4.3-.9,2,.1,2.9.4c.9.2,1.8.6,2.5,1,.8.4,1.4,1,2,1.6s1.1,1.3,1.4,2.1l-3.8,2.2c-.2-.5-.5-.9-.8-1.3-.3-.4-.7-.7-1.1-1-.4-.3-.9-.5-1.4-.7s-1.1-.2-1.8-.2c-1,0-1.9.2-2.6.6-.7.4-1.3.9-1.8,1.6s-.8,1.4-1.1,2.3c-.2.9-.3,1.8-.3,2.7h0v.1l.1-.2Zm29.1-11.2c1.6,0,3.1.3,4.3.9,1.2.6,2.4,1.4,3.3,2.4s1.6,2.2,2,3.5.7,2.8.7,4.4-.2,3-.7,4.4-1.2,2.5-2,3.5-2,1.8-3.3,2.4-2.7.9-4.3.9-3.1-.3-4.3-.9-2.4-1.4-3.2-2.4-1.6-2.2-2-3.5-.7-2.8-.7-4.4.2-3,.7-4.4,1.2-2.5,2-3.5,2-1.8,3.2-2.4,2.7-.9,4.3-.9Zm0,18.3c.9,0,1.8-.2,2.5-.5s1.3-.9,1.8-1.5.9-1.4,1.1-2.2c.2-.9.4-1.8.4-2.8h0c0-1.1-.1-2.1-.4-3s-.6-1.6-1.1-2.3c-.5-.6-1.1-1.1-1.8-1.5s-1.6-.5-2.5-.5-1.8.2-2.5.5c-.7.4-1.3.9-1.8,1.5s-.9,1.4-1.1,2.3c-.2.9-.4,1.8-.4,2.8h0c0,1.2.1,2.1.4,3,.2.9.6,1.6,1.1,2.2s1.1,1.1,1.8,1.5c.7.4,1.6.5,2.5.5Zm18.1,3.8l-6.1-22h4.9l4.2,16.5h.2l4.1-16.5h4.9l-6.1,22h-6.1Zm36.9-3.8c.6,0,1.2,0,1.8-.3s1-.5,1.4-.9.7-.9.9-1.4c.2-.6.4-1.3.4-2V6.83h4.3v14.2c0,1.2-.2,2.3-.7,3.3-.4,1-1.1,1.8-1.8,2.5s-1.7,1.2-2.8,1.6-2.3.6-3.5.6-2.5-.2-3.5-.6c-1.1-.4-2-.9-2.8-1.6s-1.4-1.5-1.8-2.5-.7-2.1-.7-3.3V6.83h4.3v13.6c0,.8.1,1.5.4,2,.2.6.6,1.1,1,1.4.4.4.9.7,1.4.9s1.1.3,1.8.3h-.1Zm12.7-18.2h4.4v9.6l7.8-9.6h5.4l-7.5,8.8,8,13.2h-5.1l-5.7-9.9-2.8,3.1v6.7h-4.4V6.83h-.1Z"></path>
+    <circle transform="translate(3 0)" class="govuk-logo-dot" cx="109.81" cy="17.83" r="3.7"></circle>
+    <path transform="translate(3 0)" d="m43.61,17.93c0,.9.1,1.8.3,2.7s.6,1.6,1.1,2.3c.5.7,1.1,1.2,1.8,1.6s1.6.6,2.6.6,1.8-.2,2.4-.5c.7-.3,1.2-.7,1.6-1.2.4-.5.7-1,.8-1.5s.2-1,.2-1.5v-.2h-5.5v-3.3h9.8v12h-3.8v-2.7c-.3.4-.6.8-1,1.2-.4.4-.9.6-1.4.9-.5.2-1.1.4-1.7.6s-1.2.2-1.9.2c-1.6,0-3-.3-4.2-.9s-2.3-1.4-3.1-2.4-1.5-2.2-1.9-3.5-.7-2.8-.7-4.4.2-3,.7-4.4,1.2-2.5,2.1-3.5,2-1.8,3.3-2.4,2.7-.9,4.3-.9,2,.1,2.9.4c.9.2,1.8.6,2.5,1,.8.4,1.4,1,2,1.6s1.1,1.3,1.4,2.1l-3.8,2.2c-.2-.5-.5-.9-.8-1.3-.3-.4-.7-.7-1.1-1-.4-.3-.9-.5-1.4-.7s-1.1-.2-1.8-.2c-1,0-1.9.2-2.6.6-.7.4-1.3.9-1.8,1.6s-.8,1.4-1.1,2.3c-.2.9-.3,1.8-.3,2.7h0v.1l.1-.2Zm29.1-11.2c1.6,0,3.1.3,4.3.9,1.2.6,2.4,1.4,3.3,2.4s1.6,2.2,2,3.5.7,2.8.7,4.4-.2,3-.7,4.4-1.2,2.5-2,3.5-2,1.8-3.3,2.4-2.7.9-4.3.9-3.1-.3-4.3-.9-2.4-1.4-3.2-2.4-1.6-2.2-2-3.5-.7-2.8-.7-4.4.2-3,.7-4.4,1.2-2.5,2-3.5,2-1.8,3.2-2.4,2.7-.9,4.3-.9Zm0,18.3c.9,0,1.8-.2,2.5-.5s1.3-.9,1.8-1.5.9-1.4,1.1-2.2c.2-.9.4-1.8.4-2.8h0c0-1.1-.1-2.1-.4-3s-.6-1.6-1.1-2.3c-.5-.6-1.1-1.1-1.8-1.5s-1.6-.5-2.5-.5-1.8.2-2.5.5c-.7.4-1.3.9-1.8,1.5s-.9,1.4-1.1,2.3c-.2.9-.4,1.8-.4,2.8h0c0,1.2.1,2.1.4,3,.2.9.6,1.6,1.1,2.2s1.1,1.1,1.8,1.5c.7.4,1.6.5,2.5.5Zm18.1,3.8l-6.1-22h4.9l4.2,16.5h.2l4.1-16.5h4.9l-6.1,22h-6.1Zm36.9-3.8c.6,0,1.2,0,1.8-.3s1-.5,1.4-.9.7-.9.9-1.4c.2-.6.4-1.3.4-2V6.83h4.3v14.2c0,1.2-.2,2.3-.7,3.3-.4,1-1.1,1.8-1.8,2.5s-1.7,1.2-2.8,1.6-2.3.6-3.5.6-2.5-.2-3.5-.6c-1.1-.4-2-.9-2.8-1.6s-1.4-1.5-1.8-2.5-.7-2.1-.7-3.3V6.83h4.3v13.6c0,.8.1,1.5.4,2,.2.6.6,1.1,1,1.4.4.4.9.7,1.4.9s1.1.3,1.8.3h-.1Zm12.7-18.2h4.4v9.6l7.8-9.6h5.4l-7.5,8.8,8,13.2h-5.1l-5.7-9.9-2.8,3.1v6.7h-4.4V6.83h-.1Z"></path>
   {%- endset %}
 
   {#- The SVG needs `focusable="false"` so that Internet Explorer does not treat