@ons/design-system 70.0.17 → 72.0.0

package/components/header/example-header-multiple-logos.njk

@@ -10,14 +10,14 @@
         "mastheadLogo": {
             "multipleLogos":{
                     "logo1": {
-                        "logoImage": "ONS Logo",
-                        "logoURL": "https://www.ons.gov.uk/"
+                        "image": "ONS Logo",
+                        "url": "https://www.ons.gov.uk/"
                     },
                     "logo2": {
-                        "logoImage": '<svg class="ons-u-di" xmlns="http://www.w3.org/2000/svg" focusable="false" width="106" height="56" viewBox="0 0 106 56" aria-labelledby="finance-ni-logo-alt"><title id="finance-ni-logo-alt">Northern Ireland Department of Finance logo</title><path d="M43.06 8.39h-9.18v.54h1.57v11.69h-1.57v.55h5.33v-.51h-1.57v-5.65h.52c1.67 0 1.95.29 2.08 2.43v.1h.42v-5.39h-.42v.07c-.05 1.59-.29 2.03-1.2 2.21-.46.05-.93.08-1.39.08V9h1.08c.67-.04 1.35-.02 2.02.05.46.09.87.33 1.17.68.46.52.68 1.06.95 2.32v.08h.41l-.22-3.73Zm3.33 5.2h-3.16v.57h1.27v6.53h-1.27v.54h4.42v-.54h-1.26v-7.1zm-.98-2.62c.64-.01 1.15-.52 1.16-1.16 0-.64-.5-1.17-1.14-1.18h-.04c-.61-.01-1.12.47-1.13 1.08v.11c-.03.61.44 1.13 1.05 1.16h.01l.08-.02Zm10.46 5.59c0-1.45-.1-1.89-.57-2.38a3.075 3.075 0 0 0-4.32.27v-.82h-3.13v.55h1.3v6.5h-1.3v.54h4.29v-.53h-1.13V18.5c0-2.26.1-3.12.46-3.63.3-.43.78-.69 1.3-.71.33 0 .65.14.88.39.29.37.37 1.01.37 3.29v2.85h-1.18v.54h4.32v-.54h-1.3v-4.13Zm8.85 3.86c-.34.29-.37.29-.49.29-.32 0-.34 0-.34-1.67v-2.55c0-1.64 0-1.79-.46-2.26a3.2 3.2 0 0 0-2.32-.83c-1.64 0-3.07.93-3.07 2.01-.01.48.36.88.84.9h.06c.47.01.86-.35.89-.82v-.08c0-.25-.11-.48-.29-.65q-.07-.1-.07-.15c0-.29.68-.71 1.35-.71.35-.02.7.1.96.34.19.22.25.37.25 1.48v1.23c-2.9.07-4.49.98-4.49 2.61 0 1.13.83 1.89 2.11 1.89.97 0 1.88-.49 2.42-1.3.12.79.83 1.35 1.62 1.29.52 0 1.02-.21 1.39-.58l.05-.06-.34-.41-.07.02Zm-2.69-2.97v.29c.05.63-.03 1.26-.25 1.86-.24.51-.74.84-1.3.85a1.01 1.01 0 0 1-1.08-.94v-.24c0-1.16.81-1.74 2.63-1.82Zm11.32-.89c0-1.45-.1-1.89-.56-2.38a3.05 3.05 0 0 0-4.3.27v-.82h-3.16v.55h1.3v6.5h-1.3v.54h4.28v-.53h-1.14V18.5c0-2.26.1-3.12.46-3.63.29-.43.78-.7 1.3-.71.33 0 .65.14.87.39.29.37.37 1.01.37 3.29v2.85h-1.16v.54h4.29v-.54h-1.22l-.03-4.13Zm7.86 2.16c-.46 1.39-1.3 2.11-2.45 2.11-.47.02-.93-.16-1.25-.51-.29-.37-.39-.93-.39-2.32 0-3.41.51-3.95 1.76-3.95.61 0 1.23.29 1.23.49l-.05.07c-.23.26-.36.59-.39.93-.04.51.34.95.85.99h.08c.54 0 .98-.43.99-.97s0-.09 0-.13c0-1.06-1.3-2.01-2.7-2.01a4.008 4.008 0 0 0-3.95 4.06 3.933 3.933 0 0 0 3.71 3.95c1.52 0 2.53-.83 3.25-2.65l.05-.12h-.65l-.08.06Zm7.31-.1c-.34 1.39-1.3 2.19-2.45 2.19a1.59 1.59 0 0 1-1.45-.78c-.22-.4-.25-.76-.25-2.63v-.5h4.93v-.1c-.15-2.06-1.47-3.38-3.41-3.38s-3.65 1.89-3.65 4.02 1.77 4.01 3.71 4.01c1.63.02 3.01-1.17 3.25-2.78v-.09h-.65l-.03.06Zm-4.18-2.28v-.35c0-1.42.4-1.95 1.48-1.95.5-.06.98.22 1.16.69.16.52.21 1.07.15 1.62h-2.78Zm-70.43 8.02-3.48-2.01v-4.07l3.48-2.04 3.48 2.04v4.07l-3.48 2.01zm0 8.12-3.48-2.01V26.4l3.48-2.04 3.48 2.04v4.07l-3.48 2.01zM6.97 12.2l-3.49-2.05V6.09l3.49-2.01 3.46 2.01v4.06L6.97 12.2zm0 8.12-3.49-2.04v-4.05l3.49-2.03 3.46 2.03v4.05l-3.46 2.04z" style="fill:#001f5b"/><path d="M6.97 28.44 3.48 26.4v-4.05l3.49-2.03 3.46 2.03v4.05l-3.46 2.04zM0 16.24V8.12l3.48 2.03v4.08L0 16.24zm0 8.12v-8.12l3.48 2.04v4.07L0 24.36z" style="fill:#001f5b"/><path d="m13.91 8.12-3.48-2.03V2.03L13.91 0l3.48 2.03v4.06l-3.48 2.03zm0 8.12-3.48-2.01v-4.08l3.48-2.03 3.48 2.03v4.08l-3.48 2.01zm6.97-4.04-3.49-2.05V6.09l3.49-2.01 3.48 2.01v4.06l-3.48 2.05zm0 8.12-3.49-2.04v-4.05l3.49-2.03 3.48 2.03v4.05l-3.48 2.04zm0 8.12-3.49-2.04v-4.05l3.49-2.03 3.48 2.03v4.05l-3.48 2.04z" style="fill:#8b9064"/><path d="m27.84 16.24-3.48-2.01v-4.08l3.48-2.03v8.12zm0 8.12-3.48-2.01v-4.07l3.48-2.04v8.12z" style="fill:#8b9064"/><path d="M36.58.46H35.1v4.37h1.64c.51 0 1-.24 1.3-.65.34-.44.52-.99.49-1.55 0-.56-.18-1.1-.53-1.53-.34-.43-.87-.67-1.42-.64Zm-.84.52h.87c.41-.02.81.16 1.05.5.21.34.31.73.3 1.13.02.44-.1.88-.34 1.25-.25.31-.64.49-1.04.46h-.84V.98Zm6.1 2.27c.03-.47-.11-.93-.4-1.3-.26-.3-.63-.47-1.02-.46-.41 0-.8.17-1.09.46-.31.36-.46.83-.41 1.3-.02.45.13.88.41 1.23.27.31.67.48 1.09.46.31 0 .61-.09.87-.26.23-.17.4-.41.48-.69l-.51-.1c-.11.37-.46.62-.84.61-.24 0-.47-.09-.65-.25-.23-.25-.33-.59-.29-.93h2.32l.04-.08Zm-2.32-.39c.01-.24.11-.47.26-.65.16-.19.4-.29.65-.29.17 0 .33.05.46.15.12.09.21.21.28.35.05.15.08.31.1.46l-1.75-.02Zm4.37-1.37c-.42.01-.8.26-.97.65v-.55h-.49v4.32h.54V4.42c.19.33.55.52.93.52.37 0 .71-.17.93-.46.26-.35.39-.78.38-1.22.02-.44-.11-.87-.36-1.24-.21-.32-.57-.52-.95-.52Zm-.1.49c.24 0 .46.12.58.33.17.28.25.6.22.93.04.34-.05.68-.24.96a.727.727 0 0 1-1.09.05.878.878 0 0 1-.29-.58v-.94c.05-.2.15-.39.29-.54.15-.13.33-.2.52-.21Zm4.47 2.2V2.85c.04-.37-.07-.74-.29-1.03-.27-.22-.61-.33-.96-.29-.83 0-1.3.29-1.42.93l.52.1c.08-.37.37-.57.87-.57.16 0 .32.03.46.1.11.05.19.14.25.25.04.17.06.34.06.51h-.41c-.5-.05-.99.06-1.42.32-.26.19-.41.49-.42.81 0 .27.1.52.29.71.23.2.53.31.84.29.47.03.91-.23 1.11-.65-.02.17 0 .33.04.5h.54c-.04-.21-.06-.43-.05-.64Zm-1.52.29a.693.693 0 0 1-.5-.15.46.46 0 0 1-.17-.39c0-.22.12-.42.32-.52.29-.14.61-.21.93-.19.15-.01.31-.01.46 0v.2c-.02.29-.15.57-.37.76-.17.2-.42.32-.69.31v-.02Zm3.77-2.98c-.17 0-.33.07-.46.18-.19.15-.34.35-.42.58v-.64h-.49v3.25h.52V3.12c0-.29.1-.58.29-.8.16-.19.4-.3.65-.29h.12v-.5a.645.645 0 0 0-.2-.03Zm1.93 3c-.32 0-.5-.15-.5-.46V2.04h.71v-.46h-.68V.74l-.52.05v.81h-.56v.46h.56v1.86c-.07.46.25.89.71.98.08.01.17.01.25 0 .15.01.31.01.46 0v-.43c-.15.02-.29.03-.44.03Zm4.73-2.8c-.17-.12-.37-.19-.58-.2-.45 0-.85.29-1.01.72a.949.949 0 0 0-.29-.49.951.951 0 0 0-.65-.22c-.42.02-.79.27-.96.65V1.6h-.4v3.25h.52V2.91c-.01-.24.07-.47.22-.65a.631.631 0 0 1 .97-.11c.14.15.21.35.19.56v2.15h.54V3.04c-.01-.28.07-.56.25-.79.13-.16.33-.25.54-.25.13 0 .25.05.35.12.09.06.16.16.19.26.04.15.06.31.06.46v2.03h.54V2.84c0-.22-.03-.44-.08-.65-.09-.2-.23-.37-.4-.5Zm3.9 1.56c.03-.47-.11-.93-.39-1.3a1.3 1.3 0 0 0-1.04-.46c-.41 0-.79.17-1.08.46-.3.36-.44.83-.39 1.3-.02.45.13.88.41 1.23.27.31.67.48 1.08.46.31 0 .61-.09.87-.26.25-.17.43-.41.52-.7l-.52-.1c-.11.37-.45.62-.83.61-.24 0-.47-.09-.65-.25-.23-.25-.33-.59-.29-.93h2.32l-.02-.06Zm-2.28-.39c.01-.24.11-.47.27-.65.28-.31.74-.37 1.08-.13.12.09.21.21.26.35.05.15.09.31.1.46l-1.71-.03Zm5.02-1.17c-.18-.13-.39-.2-.61-.2-.42.02-.8.27-.98.65v-.52h-.5v3.25h.54v-1.8c-.02-.28.07-.56.24-.79.15-.18.37-.29.61-.29.17-.01.34.05.46.17.14.18.21.4.18.63v2.08h.51V3.01c.02-.28 0-.57-.1-.84a.762.762 0 0 0-.36-.48Zm2.39 2.8c-.32 0-.5-.15-.5-.46V2.04h.72v-.46h-.71V.74l-.51.05v.81h-.58v.46h.58v1.86c-.07.46.24.89.7.97.08.01.17.01.25 0h.46v-.43c-.14.02-.28.04-.41.04Zm3.55-3c-.4 0-.79.16-1.05.46-.29.34-.44.78-.42 1.23-.01.44.11.87.36 1.23.26.32.65.5 1.06.49.42.02.83-.16 1.11-.49.28-.35.43-.78.42-1.23.02-.43-.12-.86-.39-1.2-.27-.33-.67-.51-1.1-.49Zm0 2.97c-.23 0-.46-.11-.6-.29-.2-.29-.3-.63-.27-.98-.03-.33.06-.66.24-.93a.81.81 0 0 1 .61-.29c.25 0 .49.1.65.29.19.29.27.64.23.99.03.34-.05.68-.24.96a.86.86 0 0 1-.64.26h.02ZM73.32.42c-.15-.03-.31-.04-.46-.05-.26 0-.51.07-.71.22-.2.15-.29.46-.29.98h-.54v.46h.54v2.78h.54V2.03h.76v-.46h-.76v-.08c-.03-.18.03-.37.15-.51.13-.11.3-.17.46-.15.1 0 .2.02.29.05V.42h.03Zm-36.7 29.65h-.65l-1.39 4.35h.52l.39-1.25h1.57l.46 1.28h.61l-1.49-4.37h-.02Zm.24 2.67h-1.3l.65-1.95.65 1.95Zm3.68-1.44c-.18-.13-.39-.2-.61-.2-.42 0-.8.24-.99.61v-.52h-.54v3.25h.54v-1.76c-.01-.29.08-.57.26-.8.15-.18.38-.29.62-.29.16 0 .32.06.44.17.15.18.22.42.19.65v2.05h.49v-1.89c.02-.28 0-.57-.1-.84a.797.797 0 0 0-.3-.44Zm5.77.68c.12-.19.19-.41.2-.63 0-.31-.13-.61-.35-.83-.28-.28-.66-.43-1.05-.41h-1.72v4.35h.57v-1.89h1.2l.8 1.86h.61l-.87-2.01a.96.96 0 0 0 .6-.44Zm-2.36-1.37h1.16c.21 0 .42.06.58.19.15.13.23.32.22.51 0 .22-.07.43-.22.58-.18.16-.41.24-.65.22h-1.11l.02-1.51Zm4.42.51c-.4 0-.78.17-1.04.46-.28.35-.43.78-.42 1.23 0 .44.13.87.39 1.22.25.32.65.49 1.05.46.41.02.8-.16 1.06-.46.28-.35.43-.78.42-1.23.02-.44-.12-.86-.39-1.2-.25-.33-.65-.51-1.07-.48Zm0 2.95c-.24 0-.46-.11-.61-.29-.2-.29-.29-.64-.25-.98-.03-.33.06-.66.25-.93.15-.19.37-.29.61-.29s.46.11.61.29c.19.28.28.62.25.96.04.34-.05.68-.25.96a.81.81 0 0 1-.64.26l.02.02Zm2.01-2.87h.54v3.23h-.54zm-.02-1.13h.59v.61h-.59zm3.53 1.23c-.18-.13-.39-.2-.61-.2-.42 0-.8.24-.98.61v-.52h-.49v3.25h.55v-1.76c-.02-.28.06-.56.23-.79.16-.19.4-.3.65-.29.17-.01.34.05.46.17.15.18.23.42.2.65v2.05h.5v-1.91c.02-.28-.02-.57-.1-.84a.73.73 0 0 0-.42-.44Zm3.76.44c-.17-.38-.54-.62-.96-.61-.42 0-.8.26-.98.65v-.52h-.52v3.25h.5v-1.82c-.01-.28.07-.56.25-.78.16-.2.4-.3.65-.29.16 0 .32.05.44.17.16.18.23.42.19.65v2.06h.52v-1.91c.02-.28-.02-.57-.1-.84ZM46.51 40.6c.64-.01 1.15-.52 1.16-1.16 0-.63-.49-1.16-1.13-1.17h-.03a1.16 1.16 0 0 0 0 2.32Zm.98 2.6h-3.17v.54h1.3v6.55h-2.43l-4.1-12.31h-.65l-4.32 12.31h-.93v.56h3.25v-.56h-1.62l1.17-3.54h3.71l1.16 3.54h-1.62v.56h9.53v-.56h-1.3V43.2Zm-8.02 3h-3.25l1.66-4.91 1.59 4.91Zm14.67-3.17c-.84 0-1.48.54-1.99 1.64V43.2h-3.16v.54h1.3v6.55h-1.3v.56h4.42v-.56h-1.25V48.6c0-2.21.2-3.25.73-4.22.18-.29.37-.46.46-.46s.08 0 .1.2c.05.73.34 1.11.93 1.11.55.02 1.02-.41 1.04-.96v-.09c0-.64-.52-1.16-1.16-1.16h-.01l-.1.03Zm7.75.85s.08 0 .12.25c0 .36.29.65.65.65h.07c.43 0 .78-.34.78-.77v-.08c0-.51-.42-.93-.93-.93h-.09c-.52.05-.99.32-1.3.73-.6-.49-1.36-.75-2.14-.73-1.77 0-3.09 1.16-3.09 2.78 0 .85.42 1.65 1.13 2.13-1.08.74-1.62 1.52-1.62 2.38 0 .77.52 1.45 1.27 1.65-.75.23-1.28.91-1.3 1.69 0 1.3 1.59 2.35 3.55 2.35 2.32 0 4.06-1.52 4.06-3.61 0-1.55-.65-2.13-2.32-2.13l-3.17.05c-.93 0-1.11-.22-1.11-.61s.42-.95 1.21-1.45c.45.22.95.31 1.45.29 1.77 0 3.12-1.12 3.12-2.65 0-.63-.21-1.24-.58-1.74.1-.24.15-.27.25-.27Zm-2.85 4.06c-.87 0-1.11-.37-1.11-1.69 0-2.48.17-2.67 1.16-2.67.87 0 1.11.17 1.11 1.86 0 1.39-.05 1.79-.19 2.06-.22.31-.59.48-.97.45Zm-.07 7.43c-1.35 0-2.26-.76-2.26-1.91 0-.52.21-1.02.58-1.39h.08c.36.05.72.06 1.08.05h.99c.23.01.46.01.68 0h1.13c.83 0 .98.24.98.71-.02 1.4-1.45 2.55-3.27 2.55Z" style="fill:#001f5b"/><path d="M70.45 46.48v-.1C70.3 44.32 68.98 43 67.04 43s-3.65 1.89-3.65 4.02 1.77 4.01 3.71 4.01c1.63.02 3.01-1.17 3.25-2.78v-.1h-.65v.07c-.35 1.39-1.3 2.19-2.45 2.19a1.59 1.59 0 0 1-1.45-.78c-.22-.4-.25-.77-.25-2.61v-.46h4.9v-.06Zm-3.46-2.87c.5-.07.98.22 1.16.69.17.52.22 1.07.15 1.61h-2.78v-.34c0-1.42.4-1.96 1.48-1.96Zm11.22 6.41c-.35.29-.37.29-.5.29-.32 0-.35 0-.35-1.67v-2.55c0-1.64 0-1.79-.46-2.26a3.2 3.2 0 0 0-2.32-.83c-1.65 0-3.07.93-3.07 2.01-.02.48.36.88.84.9h.03c.46.01.85-.35.87-.82s0-.06 0-.08c0-.25-.11-.48-.29-.65q-.07-.1-.07-.15c0-.29.69-.71 1.35-.71.35-.03.7.1.96.34.19.22.24.37.24 1.48v1.23c-2.9.07-4.5.98-4.5 2.61 0 1.13.84 1.89 2.11 1.89.97 0 1.88-.49 2.43-1.3.11.79.82 1.36 1.62 1.3.52 0 1.02-.21 1.39-.58l.05-.05-.35-.41Zm-2.72-2.97v.29c.05.63-.03 1.26-.25 1.86-.24.5-.74.83-1.3.85-.56.04-1.04-.37-1.09-.93v-.21c0-1.21.82-1.77 2.64-1.86ZM86.24 38h-3.16v.54h1.3v5.85a2.438 2.438 0 0 0-2.18-1.3c-1.74 0-3.25 1.81-3.25 3.97s1.5 4.06 3.31 4.06c.89-.01 1.7-.51 2.11-1.3v1.16h3.14v-.56h-1.27V38Zm-3.9 12.43c-.43-.01-.81-.25-1.01-.64-.19-.39-.25-.78-.25-2.5 0-1.95.08-2.68.27-3.07.2-.34.56-.55.95-.58 1.13 0 1.95 1.42 1.95 3.41s-.8 3.37-1.92 3.37Zm12.7-.41c-.35.29-.37.29-.49.29-.32 0-.35 0-.35-1.67v-2.55c0-1.64 0-1.79-.46-2.26a3.2 3.2 0 0 0-2.32-.83c-1.64 0-3.07.93-3.07 2.01-.02.48.36.88.84.9h.06c.47.03.87-.33.9-.8v-.1c0-.25-.11-.48-.29-.65q-.08-.1-.08-.15c0-.29.69-.71 1.35-.71.35-.02.7.1.95.34.21.22.25.37.25 1.48v1.23c-2.9.07-4.49.98-4.49 2.61 0 1.13.83 1.89 2.11 1.89.97 0 1.88-.49 2.43-1.3.11.79.82 1.36 1.62 1.3.52 0 1.03-.21 1.39-.58l.05-.05-.35-.41h-.06Zm-2.73-2.97v.29c.05.63-.03 1.26-.24 1.86-.24.51-.74.84-1.3.85-.56.04-1.04-.37-1.09-.93v-.22c0-1.2.82-1.75 2.63-1.85Zm5.5-6.45c.63-.02 1.14-.53 1.16-1.16 0-.64-.5-1.17-1.15-1.17h-.02c-.61-.03-1.13.43-1.16 1.04s0 .08 0 .12c0 .63.51 1.15 1.14 1.16h.03Zm.98 2.6h-3.14v.56h1.25v6.53h-1.25v.56h4.39v-.56h-1.25V43.2zm4.39 2.65c-1.52-.27-1.79-.5-1.79-1.01.1-.77.8-1.32 1.57-1.23 1.05 0 1.93.78 2.06 1.82v.08h.46l-.07-2.4h-.42l-.27.58c-.5-.42-1.13-.65-1.79-.65-1.28-.04-2.35.97-2.39 2.25v.16c0 1.52.69 2.16 2.65 2.5 1.45.22 1.72.58 1.72 1.13a1.49 1.49 0 0 1-1.59 1.39h-.06c-1.2 0-1.89-.73-2.35-2.53v-.07h-.42l.05 3.01h.35l.42-.56c.54.5 1.25.77 1.98.76 1.4 0 2.53-1.14 2.53-2.53v-.19c0-1.45-.73-2.18-2.63-2.5ZM33.65 25.99h71.94v.27H33.65z" style="fill:#001f5b"/></svg>'
+                        "image": '<svg class="ons-u-di" xmlns="http://www.w3.org/2000/svg" focusable="false" width="106" height="56" viewBox="0 0 106 56" aria-labelledby="finance-ni-logo-alt"><title id="finance-ni-logo-alt">Northern Ireland Department of Finance logo</title><path d="M43.06 8.39h-9.18v.54h1.57v11.69h-1.57v.55h5.33v-.51h-1.57v-5.65h.52c1.67 0 1.95.29 2.08 2.43v.1h.42v-5.39h-.42v.07c-.05 1.59-.29 2.03-1.2 2.21-.46.05-.93.08-1.39.08V9h1.08c.67-.04 1.35-.02 2.02.05.46.09.87.33 1.17.68.46.52.68 1.06.95 2.32v.08h.41l-.22-3.73Zm3.33 5.2h-3.16v.57h1.27v6.53h-1.27v.54h4.42v-.54h-1.26v-7.1zm-.98-2.62c.64-.01 1.15-.52 1.16-1.16 0-.64-.5-1.17-1.14-1.18h-.04c-.61-.01-1.12.47-1.13 1.08v.11c-.03.61.44 1.13 1.05 1.16h.01l.08-.02Zm10.46 5.59c0-1.45-.1-1.89-.57-2.38a3.075 3.075 0 0 0-4.32.27v-.82h-3.13v.55h1.3v6.5h-1.3v.54h4.29v-.53h-1.13V18.5c0-2.26.1-3.12.46-3.63.3-.43.78-.69 1.3-.71.33 0 .65.14.88.39.29.37.37 1.01.37 3.29v2.85h-1.18v.54h4.32v-.54h-1.3v-4.13Zm8.85 3.86c-.34.29-.37.29-.49.29-.32 0-.34 0-.34-1.67v-2.55c0-1.64 0-1.79-.46-2.26a3.2 3.2 0 0 0-2.32-.83c-1.64 0-3.07.93-3.07 2.01-.01.48.36.88.84.9h.06c.47.01.86-.35.89-.82v-.08c0-.25-.11-.48-.29-.65q-.07-.1-.07-.15c0-.29.68-.71 1.35-.71.35-.02.7.1.96.34.19.22.25.37.25 1.48v1.23c-2.9.07-4.49.98-4.49 2.61 0 1.13.83 1.89 2.11 1.89.97 0 1.88-.49 2.42-1.3.12.79.83 1.35 1.62 1.29.52 0 1.02-.21 1.39-.58l.05-.06-.34-.41-.07.02Zm-2.69-2.97v.29c.05.63-.03 1.26-.25 1.86-.24.51-.74.84-1.3.85a1.01 1.01 0 0 1-1.08-.94v-.24c0-1.16.81-1.74 2.63-1.82Zm11.32-.89c0-1.45-.1-1.89-.56-2.38a3.05 3.05 0 0 0-4.3.27v-.82h-3.16v.55h1.3v6.5h-1.3v.54h4.28v-.53h-1.14V18.5c0-2.26.1-3.12.46-3.63.29-.43.78-.7 1.3-.71.33 0 .65.14.87.39.29.37.37 1.01.37 3.29v2.85h-1.16v.54h4.29v-.54h-1.22l-.03-4.13Zm7.86 2.16c-.46 1.39-1.3 2.11-2.45 2.11-.47.02-.93-.16-1.25-.51-.29-.37-.39-.93-.39-2.32 0-3.41.51-3.95 1.76-3.95.61 0 1.23.29 1.23.49l-.05.07c-.23.26-.36.59-.39.93-.04.51.34.95.85.99h.08c.54 0 .98-.43.99-.97s0-.09 0-.13c0-1.06-1.3-2.01-2.7-2.01a4.008 4.008 0 0 0-3.95 4.06 3.933 3.933 0 0 0 3.71 3.95c1.52 0 2.53-.83 3.25-2.65l.05-.12h-.65l-.08.06Zm7.31-.1c-.34 1.39-1.3 2.19-2.45 2.19a1.59 1.59 0 0 1-1.45-.78c-.22-.4-.25-.76-.25-2.63v-.5h4.93v-.1c-.15-2.06-1.47-3.38-3.41-3.38s-3.65 1.89-3.65 4.02 1.77 4.01 3.71 4.01c1.63.02 3.01-1.17 3.25-2.78v-.09h-.65l-.03.06Zm-4.18-2.28v-.35c0-1.42.4-1.95 1.48-1.95.5-.06.98.22 1.16.69.16.52.21 1.07.15 1.62h-2.78Zm-70.43 8.02-3.48-2.01v-4.07l3.48-2.04 3.48 2.04v4.07l-3.48 2.01zm0 8.12-3.48-2.01V26.4l3.48-2.04 3.48 2.04v4.07l-3.48 2.01zM6.97 12.2l-3.49-2.05V6.09l3.49-2.01 3.46 2.01v4.06L6.97 12.2zm0 8.12-3.49-2.04v-4.05l3.49-2.03 3.46 2.03v4.05l-3.46 2.04z" style="fill:#001f5b"/><path d="M6.97 28.44 3.48 26.4v-4.05l3.49-2.03 3.46 2.03v4.05l-3.46 2.04zM0 16.24V8.12l3.48 2.03v4.08L0 16.24zm0 8.12v-8.12l3.48 2.04v4.07L0 24.36z" style="fill:#001f5b"/><path d="m13.91 8.12-3.48-2.03V2.03L13.91 0l3.48 2.03v4.06l-3.48 2.03zm0 8.12-3.48-2.01v-4.08l3.48-2.03 3.48 2.03v4.08l-3.48 2.01zm6.97-4.04-3.49-2.05V6.09l3.49-2.01 3.48 2.01v4.06l-3.48 2.05zm0 8.12-3.49-2.04v-4.05l3.49-2.03 3.48 2.03v4.05l-3.48 2.04zm0 8.12-3.49-2.04v-4.05l3.49-2.03 3.48 2.03v4.05l-3.48 2.04z" style="fill:#8b9064"/><path d="m27.84 16.24-3.48-2.01v-4.08l3.48-2.03v8.12zm0 8.12-3.48-2.01v-4.07l3.48-2.04v8.12z" style="fill:#8b9064"/><path d="M36.58.46H35.1v4.37h1.64c.51 0 1-.24 1.3-.65.34-.44.52-.99.49-1.55 0-.56-.18-1.1-.53-1.53-.34-.43-.87-.67-1.42-.64Zm-.84.52h.87c.41-.02.81.16 1.05.5.21.34.31.73.3 1.13.02.44-.1.88-.34 1.25-.25.31-.64.49-1.04.46h-.84V.98Zm6.1 2.27c.03-.47-.11-.93-.4-1.3-.26-.3-.63-.47-1.02-.46-.41 0-.8.17-1.09.46-.31.36-.46.83-.41 1.3-.02.45.13.88.41 1.23.27.31.67.48 1.09.46.31 0 .61-.09.87-.26.23-.17.4-.41.48-.69l-.51-.1c-.11.37-.46.62-.84.61-.24 0-.47-.09-.65-.25-.23-.25-.33-.59-.29-.93h2.32l.04-.08Zm-2.32-.39c.01-.24.11-.47.26-.65.16-.19.4-.29.65-.29.17 0 .33.05.46.15.12.09.21.21.28.35.05.15.08.31.1.46l-1.75-.02Zm4.37-1.37c-.42.01-.8.26-.97.65v-.55h-.49v4.32h.54V4.42c.19.33.55.52.93.52.37 0 .71-.17.93-.46.26-.35.39-.78.38-1.22.02-.44-.11-.87-.36-1.24-.21-.32-.57-.52-.95-.52Zm-.1.49c.24 0 .46.12.58.33.17.28.25.6.22.93.04.34-.05.68-.24.96a.727.727 0 0 1-1.09.05.878.878 0 0 1-.29-.58v-.94c.05-.2.15-.39.29-.54.15-.13.33-.2.52-.21Zm4.47 2.2V2.85c.04-.37-.07-.74-.29-1.03-.27-.22-.61-.33-.96-.29-.83 0-1.3.29-1.42.93l.52.1c.08-.37.37-.57.87-.57.16 0 .32.03.46.1.11.05.19.14.25.25.04.17.06.34.06.51h-.41c-.5-.05-.99.06-1.42.32-.26.19-.41.49-.42.81 0 .27.1.52.29.71.23.2.53.31.84.29.47.03.91-.23 1.11-.65-.02.17 0 .33.04.5h.54c-.04-.21-.06-.43-.05-.64Zm-1.52.29a.693.693 0 0 1-.5-.15.46.46 0 0 1-.17-.39c0-.22.12-.42.32-.52.29-.14.61-.21.93-.19.15-.01.31-.01.46 0v.2c-.02.29-.15.57-.37.76-.17.2-.42.32-.69.31v-.02Zm3.77-2.98c-.17 0-.33.07-.46.18-.19.15-.34.35-.42.58v-.64h-.49v3.25h.52V3.12c0-.29.1-.58.29-.8.16-.19.4-.3.65-.29h.12v-.5a.645.645 0 0 0-.2-.03Zm1.93 3c-.32 0-.5-.15-.5-.46V2.04h.71v-.46h-.68V.74l-.52.05v.81h-.56v.46h.56v1.86c-.07.46.25.89.71.98.08.01.17.01.25 0 .15.01.31.01.46 0v-.43c-.15.02-.29.03-.44.03Zm4.73-2.8c-.17-.12-.37-.19-.58-.2-.45 0-.85.29-1.01.72a.949.949 0 0 0-.29-.49.951.951 0 0 0-.65-.22c-.42.02-.79.27-.96.65V1.6h-.4v3.25h.52V2.91c-.01-.24.07-.47.22-.65a.631.631 0 0 1 .97-.11c.14.15.21.35.19.56v2.15h.54V3.04c-.01-.28.07-.56.25-.79.13-.16.33-.25.54-.25.13 0 .25.05.35.12.09.06.16.16.19.26.04.15.06.31.06.46v2.03h.54V2.84c0-.22-.03-.44-.08-.65-.09-.2-.23-.37-.4-.5Zm3.9 1.56c.03-.47-.11-.93-.39-1.3a1.3 1.3 0 0 0-1.04-.46c-.41 0-.79.17-1.08.46-.3.36-.44.83-.39 1.3-.02.45.13.88.41 1.23.27.31.67.48 1.08.46.31 0 .61-.09.87-.26.25-.17.43-.41.52-.7l-.52-.1c-.11.37-.45.62-.83.61-.24 0-.47-.09-.65-.25-.23-.25-.33-.59-.29-.93h2.32l-.02-.06Zm-2.28-.39c.01-.24.11-.47.27-.65.28-.31.74-.37 1.08-.13.12.09.21.21.26.35.05.15.09.31.1.46l-1.71-.03Zm5.02-1.17c-.18-.13-.39-.2-.61-.2-.42.02-.8.27-.98.65v-.52h-.5v3.25h.54v-1.8c-.02-.28.07-.56.24-.79.15-.18.37-.29.61-.29.17-.01.34.05.46.17.14.18.21.4.18.63v2.08h.51V3.01c.02-.28 0-.57-.1-.84a.762.762 0 0 0-.36-.48Zm2.39 2.8c-.32 0-.5-.15-.5-.46V2.04h.72v-.46h-.71V.74l-.51.05v.81h-.58v.46h.58v1.86c-.07.46.24.89.7.97.08.01.17.01.25 0h.46v-.43c-.14.02-.28.04-.41.04Zm3.55-3c-.4 0-.79.16-1.05.46-.29.34-.44.78-.42 1.23-.01.44.11.87.36 1.23.26.32.65.5 1.06.49.42.02.83-.16 1.11-.49.28-.35.43-.78.42-1.23.02-.43-.12-.86-.39-1.2-.27-.33-.67-.51-1.1-.49Zm0 2.97c-.23 0-.46-.11-.6-.29-.2-.29-.3-.63-.27-.98-.03-.33.06-.66.24-.93a.81.81 0 0 1 .61-.29c.25 0 .49.1.65.29.19.29.27.64.23.99.03.34-.05.68-.24.96a.86.86 0 0 1-.64.26h.02ZM73.32.42c-.15-.03-.31-.04-.46-.05-.26 0-.51.07-.71.22-.2.15-.29.46-.29.98h-.54v.46h.54v2.78h.54V2.03h.76v-.46h-.76v-.08c-.03-.18.03-.37.15-.51.13-.11.3-.17.46-.15.1 0 .2.02.29.05V.42h.03Zm-36.7 29.65h-.65l-1.39 4.35h.52l.39-1.25h1.57l.46 1.28h.61l-1.49-4.37h-.02Zm.24 2.67h-1.3l.65-1.95.65 1.95Zm3.68-1.44c-.18-.13-.39-.2-.61-.2-.42 0-.8.24-.99.61v-.52h-.54v3.25h.54v-1.76c-.01-.29.08-.57.26-.8.15-.18.38-.29.62-.29.16 0 .32.06.44.17.15.18.22.42.19.65v2.05h.49v-1.89c.02-.28 0-.57-.1-.84a.797.797 0 0 0-.3-.44Zm5.77.68c.12-.19.19-.41.2-.63 0-.31-.13-.61-.35-.83-.28-.28-.66-.43-1.05-.41h-1.72v4.35h.57v-1.89h1.2l.8 1.86h.61l-.87-2.01a.96.96 0 0 0 .6-.44Zm-2.36-1.37h1.16c.21 0 .42.06.58.19.15.13.23.32.22.51 0 .22-.07.43-.22.58-.18.16-.41.24-.65.22h-1.11l.02-1.51Zm4.42.51c-.4 0-.78.17-1.04.46-.28.35-.43.78-.42 1.23 0 .44.13.87.39 1.22.25.32.65.49 1.05.46.41.02.8-.16 1.06-.46.28-.35.43-.78.42-1.23.02-.44-.12-.86-.39-1.2-.25-.33-.65-.51-1.07-.48Zm0 2.95c-.24 0-.46-.11-.61-.29-.2-.29-.29-.64-.25-.98-.03-.33.06-.66.25-.93.15-.19.37-.29.61-.29s.46.11.61.29c.19.28.28.62.25.96.04.34-.05.68-.25.96a.81.81 0 0 1-.64.26l.02.02Zm2.01-2.87h.54v3.23h-.54zm-.02-1.13h.59v.61h-.59zm3.53 1.23c-.18-.13-.39-.2-.61-.2-.42 0-.8.24-.98.61v-.52h-.49v3.25h.55v-1.76c-.02-.28.06-.56.23-.79.16-.19.4-.3.65-.29.17-.01.34.05.46.17.15.18.23.42.2.65v2.05h.5v-1.91c.02-.28-.02-.57-.1-.84a.73.73 0 0 0-.42-.44Zm3.76.44c-.17-.38-.54-.62-.96-.61-.42 0-.8.26-.98.65v-.52h-.52v3.25h.5v-1.82c-.01-.28.07-.56.25-.78.16-.2.4-.3.65-.29.16 0 .32.05.44.17.16.18.23.42.19.65v2.06h.52v-1.91c.02-.28-.02-.57-.1-.84ZM46.51 40.6c.64-.01 1.15-.52 1.16-1.16 0-.63-.49-1.16-1.13-1.17h-.03a1.16 1.16 0 0 0 0 2.32Zm.98 2.6h-3.17v.54h1.3v6.55h-2.43l-4.1-12.31h-.65l-4.32 12.31h-.93v.56h3.25v-.56h-1.62l1.17-3.54h3.71l1.16 3.54h-1.62v.56h9.53v-.56h-1.3V43.2Zm-8.02 3h-3.25l1.66-4.91 1.59 4.91Zm14.67-3.17c-.84 0-1.48.54-1.99 1.64V43.2h-3.16v.54h1.3v6.55h-1.3v.56h4.42v-.56h-1.25V48.6c0-2.21.2-3.25.73-4.22.18-.29.37-.46.46-.46s.08 0 .1.2c.05.73.34 1.11.93 1.11.55.02 1.02-.41 1.04-.96v-.09c0-.64-.52-1.16-1.16-1.16h-.01l-.1.03Zm7.75.85s.08 0 .12.25c0 .36.29.65.65.65h.07c.43 0 .78-.34.78-.77v-.08c0-.51-.42-.93-.93-.93h-.09c-.52.05-.99.32-1.3.73-.6-.49-1.36-.75-2.14-.73-1.77 0-3.09 1.16-3.09 2.78 0 .85.42 1.65 1.13 2.13-1.08.74-1.62 1.52-1.62 2.38 0 .77.52 1.45 1.27 1.65-.75.23-1.28.91-1.3 1.69 0 1.3 1.59 2.35 3.55 2.35 2.32 0 4.06-1.52 4.06-3.61 0-1.55-.65-2.13-2.32-2.13l-3.17.05c-.93 0-1.11-.22-1.11-.61s.42-.95 1.21-1.45c.45.22.95.31 1.45.29 1.77 0 3.12-1.12 3.12-2.65 0-.63-.21-1.24-.58-1.74.1-.24.15-.27.25-.27Zm-2.85 4.06c-.87 0-1.11-.37-1.11-1.69 0-2.48.17-2.67 1.16-2.67.87 0 1.11.17 1.11 1.86 0 1.39-.05 1.79-.19 2.06-.22.31-.59.48-.97.45Zm-.07 7.43c-1.35 0-2.26-.76-2.26-1.91 0-.52.21-1.02.58-1.39h.08c.36.05.72.06 1.08.05h.99c.23.01.46.01.68 0h1.13c.83 0 .98.24.98.71-.02 1.4-1.45 2.55-3.27 2.55Z" style="fill:#001f5b"/><path d="M70.45 46.48v-.1C70.3 44.32 68.98 43 67.04 43s-3.65 1.89-3.65 4.02 1.77 4.01 3.71 4.01c1.63.02 3.01-1.17 3.25-2.78v-.1h-.65v.07c-.35 1.39-1.3 2.19-2.45 2.19a1.59 1.59 0 0 1-1.45-.78c-.22-.4-.25-.77-.25-2.61v-.46h4.9v-.06Zm-3.46-2.87c.5-.07.98.22 1.16.69.17.52.22 1.07.15 1.61h-2.78v-.34c0-1.42.4-1.96 1.48-1.96Zm11.22 6.41c-.35.29-.37.29-.5.29-.32 0-.35 0-.35-1.67v-2.55c0-1.64 0-1.79-.46-2.26a3.2 3.2 0 0 0-2.32-.83c-1.65 0-3.07.93-3.07 2.01-.02.48.36.88.84.9h.03c.46.01.85-.35.87-.82s0-.06 0-.08c0-.25-.11-.48-.29-.65q-.07-.1-.07-.15c0-.29.69-.71 1.35-.71.35-.03.7.1.96.34.19.22.24.37.24 1.48v1.23c-2.9.07-4.5.98-4.5 2.61 0 1.13.84 1.89 2.11 1.89.97 0 1.88-.49 2.43-1.3.11.79.82 1.36 1.62 1.3.52 0 1.02-.21 1.39-.58l.05-.05-.35-.41Zm-2.72-2.97v.29c.05.63-.03 1.26-.25 1.86-.24.5-.74.83-1.3.85-.56.04-1.04-.37-1.09-.93v-.21c0-1.21.82-1.77 2.64-1.86ZM86.24 38h-3.16v.54h1.3v5.85a2.438 2.438 0 0 0-2.18-1.3c-1.74 0-3.25 1.81-3.25 3.97s1.5 4.06 3.31 4.06c.89-.01 1.7-.51 2.11-1.3v1.16h3.14v-.56h-1.27V38Zm-3.9 12.43c-.43-.01-.81-.25-1.01-.64-.19-.39-.25-.78-.25-2.5 0-1.95.08-2.68.27-3.07.2-.34.56-.55.95-.58 1.13 0 1.95 1.42 1.95 3.41s-.8 3.37-1.92 3.37Zm12.7-.41c-.35.29-.37.29-.49.29-.32 0-.35 0-.35-1.67v-2.55c0-1.64 0-1.79-.46-2.26a3.2 3.2 0 0 0-2.32-.83c-1.64 0-3.07.93-3.07 2.01-.02.48.36.88.84.9h.06c.47.03.87-.33.9-.8v-.1c0-.25-.11-.48-.29-.65q-.08-.1-.08-.15c0-.29.69-.71 1.35-.71.35-.02.7.1.95.34.21.22.25.37.25 1.48v1.23c-2.9.07-4.49.98-4.49 2.61 0 1.13.83 1.89 2.11 1.89.97 0 1.88-.49 2.43-1.3.11.79.82 1.36 1.62 1.3.52 0 1.03-.21 1.39-.58l.05-.05-.35-.41h-.06Zm-2.73-2.97v.29c.05.63-.03 1.26-.24 1.86-.24.51-.74.84-1.3.85-.56.04-1.04-.37-1.09-.93v-.22c0-1.2.82-1.75 2.63-1.85Zm5.5-6.45c.63-.02 1.14-.53 1.16-1.16 0-.64-.5-1.17-1.15-1.17h-.02c-.61-.03-1.13.43-1.16 1.04s0 .08 0 .12c0 .63.51 1.15 1.14 1.16h.03Zm.98 2.6h-3.14v.56h1.25v6.53h-1.25v.56h4.39v-.56h-1.25V43.2zm4.39 2.65c-1.52-.27-1.79-.5-1.79-1.01.1-.77.8-1.32 1.57-1.23 1.05 0 1.93.78 2.06 1.82v.08h.46l-.07-2.4h-.42l-.27.58c-.5-.42-1.13-.65-1.79-.65-1.28-.04-2.35.97-2.39 2.25v.16c0 1.52.69 2.16 2.65 2.5 1.45.22 1.72.58 1.72 1.13a1.49 1.49 0 0 1-1.59 1.39h-.06c-1.2 0-1.89-.73-2.35-2.53v-.07h-.42l.05 3.01h.35l.42-.56c.54.5 1.25.77 1.98.76 1.4 0 2.53-1.14 2.53-2.53v-.19c0-1.45-.73-2.18-2.63-2.5ZM33.65 25.99h71.94v.27H33.65z" style="fill:#001f5b"/></svg>'
                     },
                     "logo3": {
-                        "logoImage": '
+                        "image": '
                         <svg class="ons-u-di" xmlns="http://www.w3.org/2000/svg" focusable="false" width="105" height="56" viewBox="0 0 124 56" aria-labelledby="dbt-logo-alt">
                         <title id="dbt-logo-alt">Department for Business and Trade logo</title>
                         <path d="M0 0h1.31v56H0V0Z" fill="#ce0e2d"/>

package/components/hero/_hero.scss

@@ -25,21 +25,20 @@
         height: 100%;
     }
 
+    &__text {
+        padding-bottom: 1rem;
+    }
+
     &__pre-title {
         margin-bottom: 0.5rem;
 
-        @include mq(xxs, m) {
+        @include mq('2xs', m) {
             max-width: 145px;
         }
     }
 
-    &__title {
-        font-size: 2.3rem;
-        line-height: 1.2;
-    }
-
     &__details {
-        padding-bottom: 3rem;
+        padding-bottom: 3.5rem;
         padding-top: 2rem;
         position: relative;
         z-index: 5;
@@ -51,7 +50,6 @@
 
             a {
                 color: inherit;
-                text-decoration: underline solid var(--ons-color-text-inverse-link) 1px;
             }
 
             a:hover {

package/components/hero/_macro.njk

@@ -9,7 +9,7 @@
         <div class="ons-hero__container ons-container{{ ' ons-container--wide' if params.wide }}">
             <div class="ons-hero__details ons-grid__col ons-col-{{ detailsColumns }}@m ons-col-10@s@m">
                 <header>
-                    <h1 class="ons-hero__title ons-u-fs-xxxl">{{ params.title }}</h1>
+                    <h1 class="ons-hero__title ons-u-fs-3xl">{{ params.title }}</h1>
                     {% if params.subtitle %}
                         <h2 class="ons-hero__subtitle ons-u-fs-r--b">{{ params.subtitle }}</h2>
                     {% endif %}

package/components/icon/_icon.scss

@@ -1,9 +1,9 @@
 .ons-icon {
-    height: 1rem;
+    height: 1.125rem;
     vertical-align: middle;
-    width: 1rem;
+    width: 1.125rem;
 
-    &--xxxl {
+    &--3xl {
         height: 1.7rem;
         width: 1.7rem;
 
@@ -13,7 +13,7 @@
         }
     }
 
-    &--xxl {
+    &--2xl {
         height: 1.5rem;
         width: 1.5rem;
 

package/components/icon/_macro.njk

@@ -345,8 +345,8 @@
         <svg
             class="ons-icon--logo{{ iconClasses }}"
             xmlns="http://www.w3.org/2000/svg"
-            width="197"
-            height="19"
+            width="208"
+            height="20"
             viewBox="33 2 552 60"
             aria-labelledby="{{ params.altTextId | default ('ons-logo-en-alt') }}"
             role="img"
@@ -442,8 +442,8 @@
         <svg
             class="ons-icon--logo{{ iconClasses }}"
             xmlns="http://www.w3.org/2000/svg"
-            width="207"
-            height="19"
+            width="218"
+            height="20"
             viewBox="15 2 620 60"
             aria-labelledby="{{ params.altTextId | default ('ons-logo-cy-alt') }}"
             role="img"

package/components/icon/_macro.spec.js

@@ -88,11 +88,11 @@ describe('macro: icon', () => {
             const $ = cheerio.load(
                 renderComponent('icon', {
                     iconType,
-                    iconSize: 'xxl',
+                    iconSize: '2xl',
                 }),
             );
 
-            expect($('svg').hasClass('ons-icon--xxl')).toBe(true);
+            expect($('svg').hasClass('ons-icon--2xl')).toBe(true);
         });
     });
 

package/components/image/_image.scss

@@ -1,7 +1,7 @@
 .ons-image {
     margin: 0;
 
-    @extend .ons-u-mb-m;
+    @extend .ons-u-mb-l;
 
     &__img {
         display: block;

package/components/image/_macro.njk

@@ -7,7 +7,7 @@
                 alt="{{ params.alt if params.alt }}"
             />
         {% else %}
-            <img class="ons-image__img" src="{{ params.url }}" alt="{{ params.alt }}" />
+            <img class="ons-image__img" src="{{ params.src }}" alt="{{ params.alt }}" />
         {% endif %}
 
         {% if params.caption %}

package/components/image/_macro.spec.js

@@ -5,8 +5,8 @@ import * as cheerio from 'cheerio';
 import axe from '../../tests/helpers/axe';
 import { renderComponent } from '../../tests/helpers/rendering';
 
-const EXAMPLE_IMAGE_URL_MINIMAL = {
-    url: 'example.png',
+const EXAMPLE_IMAGE_SRC_URL_MINIMAL = {
+    src: 'example.png',
 };
 
 const EXAMPLE_IMAGE_IMAGE_MINIMAL = {
@@ -18,7 +18,7 @@ const EXAMPLE_IMAGE_IMAGE_MINIMAL = {
 
 describe('macro: image', () => {
     it('outputs a `figure` element', () => {
-        const $ = cheerio.load(renderComponent('image', EXAMPLE_IMAGE_URL_MINIMAL));
+        const $ = cheerio.load(renderComponent('image', EXAMPLE_IMAGE_SRC_URL_MINIMAL));
 
         expect($('.ons-image')[0].tagName).toBe('figure');
     });
@@ -26,7 +26,7 @@ describe('macro: image', () => {
     it('outputs a `figurecaption` element when `caption` is provided', () => {
         const $ = cheerio.load(
             renderComponent('image', {
-                ...EXAMPLE_IMAGE_URL_MINIMAL,
+                ...EXAMPLE_IMAGE_SRC_URL_MINIMAL,
                 caption: 'Example image caption',
             }),
         );
@@ -37,7 +37,7 @@ describe('macro: image', () => {
     it('outputs a `figurecaption` element with provided `caption` text', () => {
         const $ = cheerio.load(
             renderComponent('image', {
-                ...EXAMPLE_IMAGE_URL_MINIMAL,
+                ...EXAMPLE_IMAGE_SRC_URL_MINIMAL,
                 caption: 'Example image caption',
             }),
         );
@@ -45,22 +45,22 @@ describe('macro: image', () => {
         expect($('.ons-image__caption').text().trim()).toBe('Example image caption');
     });
 
-    describe('mode: url', () => {
+    describe('mode: src', () => {
         it('passes jest-axe checks', async () => {
-            const $ = cheerio.load(renderComponent('image', EXAMPLE_IMAGE_URL_MINIMAL));
+            const $ = cheerio.load(renderComponent('image', EXAMPLE_IMAGE_SRC_URL_MINIMAL));
 
             const results = await axe($.html());
             expect(results).toHaveNoViolations();
         });
 
         it('outputs an `img` element', () => {
-            const $ = cheerio.load(renderComponent('image', EXAMPLE_IMAGE_URL_MINIMAL));
+            const $ = cheerio.load(renderComponent('image', EXAMPLE_IMAGE_SRC_URL_MINIMAL));
 
             expect($('.ons-image__img')[0].tagName).toBe('img');
         });
 
         it('outputs an `img` element with the expected `src`', () => {
-            const $ = cheerio.load(renderComponent('image', EXAMPLE_IMAGE_URL_MINIMAL));
+            const $ = cheerio.load(renderComponent('image', EXAMPLE_IMAGE_SRC_URL_MINIMAL));
 
             expect($('.ons-image__img').attr('src')).toBe('example.png');
         });
@@ -68,7 +68,7 @@ describe('macro: image', () => {
         it('outputs an `img` element with the expected alt text', () => {
             const $ = cheerio.load(
                 renderComponent('image', {
-                    ...EXAMPLE_IMAGE_URL_MINIMAL,
+                    ...EXAMPLE_IMAGE_SRC_URL_MINIMAL,
                     alt: 'Example alt text',
                 }),
             );

package/components/image/example-image-for-regular-screens.njk

@@ -1,7 +1,7 @@
 {% from "components/image/_macro.njk" import onsImage %}
 {{
     onsImage({
-        "url": '/img/small/woman-in-purple-dress-shirt.jpg',
+        "src": '/img/small/woman-in-purple-dress-shirt.jpg',
         "alt": 'Woman in a purple dress shirt using a laptop',
         "caption": 'Image 1 - Woman in a purple dress shirt using a laptop'
     })

package/components/input/_input-type.scss

@@ -31,9 +31,7 @@
         background-color: var(--ons-color-button-secondary);
         display: block;
         flex: 0 0 auto;
-        font-size: 1rem;
         font-weight: $font-weight-bold;
-        line-height: normal;
         padding: $input-padding-vertical $input-padding-horizontal * 2;
         text-align: center;
         white-space: nowrap;

package/components/input/_input.scss

@@ -19,12 +19,12 @@
     color: inherit;
     display: block;
     font-family: inherit;
-    font-size: 1rem;
-    line-height: 1rem;
     padding: $input-padding-vertical $input-padding-horizontal;
     position: relative;
     width: 100%;
     z-index: 3;
+    height: 2.5rem;
+    line-height: 1.75rem;
 
     &::-ms-clear {
         display: none;
@@ -61,7 +61,7 @@
     }
 
     &--with-description {
-        margin-bottom: 0.55rem;
+        margin-bottom: 0.5rem;
     }
 
     &--with-text-description {
@@ -70,10 +70,10 @@
 }
 
 // Text input widths
-@include input-width('ons-input--w-{x}');
+@include input-width($class-name: 'ons-input--w-{x}');
 
 // Number input widths
-@include input-width('ons-input-number--w-{x}', 0.54rem);
+@include input-width($class-name: 'ons-input-number--w-{x}', $char-width: 0.607rem);
 
 .ons-input--postcode {
     max-width: input-width-calc($chars: 5, $num-chars: 2, $spaces: 1);
@@ -83,7 +83,7 @@
 .ons-input__helper {
     font-size: 0.8rem;
     font-weight: $font-weight-bold;
-    margin-top: 0.2rem;
+    margin-top: 0.25rem;
 }
 
 .ons-input--select {
@@ -92,8 +92,7 @@
         url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11.75 7.7'%3E%3Cpath fill='currentColor' d='m1.37.15 4.5 5.1 4.5-5.1a.37.37 0 0 1 .6 0l.7.7a.45.45 0 0 1 0 .5l-5.5 6.2a.37.37 0 0 1-.6 0l-5.5-6.1a.64.64 0 0 1 0-.6l.7-.7a.64.64 0 0 1 .6 0Z'/%3E%3C/svg%3E")
         no-repeat center right 10px;
     background-size: 1rem;
-    line-height: 1.3rem;
-    padding: 0.39rem 2rem 0.39rem $input-padding-horizontal;
+    padding: 0.25rem 2rem 0.25rem $input-padding-horizontal;
 
     &::-ms-expand {
         display: none;
@@ -101,9 +100,9 @@
 }
 
 .ons-input--textarea {
-    line-height: normal;
     resize: vertical;
     width: 100%;
+    height: auto;
 }
 
 .ons-input--block {
@@ -147,6 +146,7 @@
     display: flex;
     flex-flow: row nowrap !important;
     gap: 0.5rem;
+    height: 2.5rem;
 }
 
 .ons-input-search {
@@ -157,7 +157,7 @@
         background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' fill='%23ffffff'%3E%3Cpath d='M0 0h24v24H0V0z' fill='none'/%3E%3Cpath d='M11.86 10.23 8.62 6.99a4.63 4.63 0 1 0-6.34 1.64 4.55 4.55 0 0 0 2.36.64 4.65 4.65 0 0 0 2.33-.65l3.24 3.23a.46.46 0 0 0 .65 0l1-1a.48.48 0 0 0 0-.62Zm-5-3.32a3.28 3.28 0 0 1-2.31.93 3.22 3.22 0 1 1 2.35-.93Z'/%3E%3C/svg%3E");
         background-position: 12px 10px;
         background-repeat: no-repeat;
-        background-size: 18px 18px;
+        background-size: 16px;
         padding-left: 2.4rem;
 
         &:focus,

package/components/input/_macro.njk

@@ -109,7 +109,9 @@
                 </span>
             {% endif %}
         {% elif params.searchButton %}
-            <span class="ons-grid--flex ons-input_search-button{{ ' ons-input--with-text-description' if params.label.description }}">
+            <span
+                class="ons-grid-flex ons-grid-flex--vertical-top ons-input_search-button{{ ' ons-input--with-text-description' if params.label.description }}"
+            >
                 {% if params.accessiblePlaceholder %}
                     {{
                         onsLabel({
@@ -150,7 +152,7 @@
             </span>
         {% else %}
             {% if params.accessiblePlaceholder %}
-                <span class="ons-grid--flex{{ ' ons-input--with-text-description' if params.label.description }}">
+                <span class="ons-grid-flex{{ ' ons-input--with-text-description' if params.label.description }}">
                     {{
                         onsLabel({
                             "for": params.id,

package/components/input/example-input-search-with-character-check.njk

@@ -4,7 +4,7 @@
         "id": 'search-field',
         "label": {
             'text': 'Filter results',
-            "classes": 'ons-u-pb-xxs ons-u-mb-no'
+            "classes": 'ons-u-pb-3xs ons-u-mb-no'
         },
         "searchButton": {
             "text": 'Filter'

package/components/input/example-input-search.njk

@@ -4,7 +4,7 @@
         "id": 'search-field',
         "label": {
             'text': 'Search',
-            "classes": 'ons-u-pb-xxs ons-u-mb-no'
+            "classes": 'ons-u-pb-3xs ons-u-mb-no'
         },
         "searchButton": {
             "visuallyHideButtonText": true,

package/components/label/_label.scss

@@ -2,13 +2,12 @@
     color: inherit;
     display: block;
     font-weight: $font-weight-bold;
-    margin: 0 0 0.6rem;
+    margin: 0 0 0.5rem;
 
     &__description {
         @extend .ons-u-fs-s;
 
         display: block;
-        line-height: 1.4;
     }
 
     &--with-description {
@@ -17,7 +16,6 @@
     }
 
     &--placeholder {
-        font-size: 1rem;
         font-weight: $font-weight-regular;
         color: var(--ons-color-placeholder);
         left: 10px;

package/components/language-selector/_macro.njk

@@ -2,15 +2,15 @@
     {% set alternativeLanguages = params.languages | rejectattr("current") %}
     {% set languageNumber = params.languages | length %}
 
-    <ul class="ons-language-links{{ ' ons-u-d-no@xxs@m' if languageNumber and languageNumber != 2 }}">
+    <ul class="ons-language-links{{ ' ons-u-d-no@2xs@m' if languageNumber and languageNumber != 2 }}">
         {% for language in alternativeLanguages %}
             <li class="ons-language-links__item">
                 <a
                     href="{{ language.url }}"
-                    lang="{{ language.ISOCode }}"
+                    lang="{{ language.isoCode }}"
                     {% if language.attributes %}{% for attribute, value in (language.attributes) %}{{ ' ' }}{{ attribute }}="{{ value }}"{% endfor %}{% endif %}
                     >{% if language.abbrText %}
-                        <span class="ons-u-d-no@s">{{ language.abbrText }}</span><span class="ons-u-d-no@xxs@s">{{- language.text -}}</span>
+                        <span class="ons-u-d-no@s">{{ language.abbrText }}</span><span class="ons-u-d-no@2xs@s">{{- language.text -}}</span>
                     {% else %}
                         {{- language.text -}}
                     {% endif %}</a

package/components/language-selector/_macro.spec.js

@@ -9,14 +9,14 @@ const EXAMPLE_WITH_TWO_LANGUAGES = {
     languages: [
         {
             url: '/english',
-            ISOCode: 'en',
+            isoCode: 'en',
             text: 'English',
             abbrText: 'EN',
             current: true,
         },
         {
             url: '/cymraeg',
-            ISOCode: 'cy',
+            isoCode: 'cy',
             text: 'Cymraeg',
             abbrText: 'CY',
             current: false,
@@ -32,19 +32,19 @@ const EXAMPLE_WITH_THREE_LANGUAGES = {
     languages: [
         {
             url: '/english',
-            ISOCode: 'en',
+            isoCode: 'en',
             text: 'English',
             current: false,
         },
         {
             url: '/cymraeg',
-            ISOCode: 'cy',
+            isoCode: 'cy',
             text: 'Cymraeg',
             current: true,
         },
         {
             url: '/polski',
-            ISOCode: 'pl',
+            isoCode: 'pl',
             text: 'Polski',
             current: false,
         },
@@ -96,7 +96,7 @@ describe('macro: language-selector', () => {
         it('does not have a visibility class applied', () => {
             const $ = cheerio.load(renderComponent('language-selector', EXAMPLE_WITH_TWO_LANGUAGES));
 
-            expect($('.ons-language-links').hasClass('ons-u-d-no@xxs@m')).toBe(false);
+            expect($('.ons-language-links').hasClass('ons-u-d-no@2xs@m')).toBe(false);
         });
 
         it('has the `abbrText` rendered', () => {
@@ -131,7 +131,7 @@ describe('macro: language-selector', () => {
         it('has the visibility class applied', () => {
             const $ = cheerio.load(renderComponent('language-selector', EXAMPLE_WITH_THREE_LANGUAGES));
 
-            expect($('.ons-language-links').hasClass('ons-u-d-no@xxs@m')).toBe(true);
+            expect($('.ons-language-links').hasClass('ons-u-d-no@2xs@m')).toBe(true);
         });
     });
 });

package/components/list/_list.scss

@@ -6,9 +6,6 @@
         &:first-child {
             margin-top: 0.5rem;
         }
-        &:last-child {
-            margin-bottom: -0.5;
-        }
     }
 
     &--spacious {
@@ -80,8 +77,7 @@
     &--icons {
         margin-bottom: 0;
         .ons-list__item {
-            margin-top: 0;
-            margin-bottom: 0.5rem;
+            margin: 0 0 0.5rem;
         }
     }
 

package/components/list/_macro.njk

@@ -21,17 +21,18 @@
         {% set listEl = 'ul' %}
     {% endif %}
 
-    {# Remove "and not params.itemsList[0].url" in future update #}
-    {% if listLength < 2 and not params.attributes and not params.itemsList[0].url %}
-        {% set attributes = params.itemsList[0].attributes %}
+    {% if listLength < 2 and not params.attributes %}
+        {% set attributes = [params.itemsList[0].attributes] %}
+    {% elif listLength < 2 and params.attributes and params.itemsList[0].attributes and listEl == 'p' %}
+        {% set attributes = [params.attributes, params.itemsList[0].attributes] %}
     {% else %}
-        {% set attributes = params.attributes %}
+        {% set attributes = [params.attributes] %}
     {% endif %}
     {% set openingTag = "<" + listEl %}
     {% set closingTag = "</" + listEl + ">" %}
 
     {{ openingTag | safe }}{% if params.id %}{{ ' ' }}id="{{ params.id }}"{% endif %}
-    class="ons-list{{ ' ons-list--p' if listEl == 'p' }}{{ ' ' + params.classes if params.classes else '' }}{% if params.variants %}{% if params.variants is not string %}{% for variant in variants %}{{ ' ' }}ons-list--{{ variant }}{% endfor %}{% else %}{{ ' ' }}ons-list--{{ variants }}{% endif %}{% endif %}{{ ' ' + otherClasses if otherClasses else '' }}"{% if params.attributes or params.itemsList[0].attributes %}{% for attribute, value in (attributes.items() if attributes is mapping and attributes.items else attributes) %}{{ ' ' }}{{ attribute }}{% if value %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
+    class="ons-list{{ ' ons-list--p' if listEl == 'p' }}{{ ' ' + params.classes if params.classes else '' }}{% if params.variants %}{% if params.variants is not string %}{% for variant in variants %}{{ ' ' }}ons-list--{{ variant }}{% endfor %}{% else %}{{ ' ' }}ons-list--{{ variants }}{% endif %}{% endif %}{{ ' ' + otherClasses if otherClasses else '' }}"{% if params.attributes or params.itemsList[0].attributes %}{% for attributeList in attributes %}{% for attribute, value in (attributeList.items() if attributeList is mapping and attributeList.items else attributeList) %}{{ ' ' }}{{ attribute }}{% if value %}="{{ value }}"{% endif %}{% endfor %}{% endfor %}{% endif %}>
     {%- for item in params.itemsList -%}
         {% set sublistClasses = item.listClasses if item.listClasses %}
         {%
@@ -78,15 +79,14 @@
                     {{
                         onsExternalLink({
                             "url": item.url,
-                            "linkText": itemText
+                            "text": itemText
                         })
                     }}
                 {%- else -%}
-                    {# Remove setting attributes on link in future update #}
                     <a
                         href="{{ item.url }}"
                         class="ons-list__link{{ ' ons-js-inpagelink' if item.variants == 'inPageLink' }}{{ ' ' + item.classes if item.classes else '' }}"
-                        {% if item.target %}target="{{ item.target }}"{% endif %}{% if item.attributes %}{% for attribute, value in (item.attributes.items() if item.attributes is mapping and item.attributes.items else item.attributes) %}{{ ' ' }}{{ attribute }}{% if value %}="{{ value }}"{% endif %}{% endfor %}{% endif %}
+                        {% if item.target %}target="{{ item.target }}"{% endif %}
                     >
                         {%- if item.prefix -%}<span class="ons-u-vh">{{- item.prefix -}}</span>{%- endif -%} {{- itemText | safe -}}
                         {%- if item.target == "_blank" -%}
@@ -124,11 +124,10 @@
         {% endset %}
 
         {% if listLength > 1 or listEl == 'ul' %}
-            {# Remove if not item.url in future update #}
             <li
                 class="ons-list__item{{ ' ' + item.listClasses if item.listClasses else '' }}"
                 {% if item.current %}aria-current="true"{% endif %}
-                {% if not item.url %}{% if item.attributes %}{% for attribute, value in (item.attributes.items() if item.attributes is mapping and item.attributes.items else item.attributes) %}{{ ' ' }}{{ attribute }}{% if value %}="{{ value }}"{% endif %}{% endfor %}{% endif %}{% endif %}
+                {% if item.attributes %}{% for attribute, value in (item.attributes.items() if item.attributes is mapping and item.attributes.items else item.attributes) %}{{ ' ' }}{{ attribute }}{% if value %}="{{ value }}"{% endif %}{% endfor %}{% endif %}
             >
                 {{- listItem | safe -}}
             </li>