Merge branch 'main' into 2835/bug/ons-grid__col-sticky-css-functional…

…ity-is-broken
ONSdigital · Dec 1, 2023 · 7563cef · 7563cef
2 parents c470473 + a1a2a5d
commit 7563cef
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 32 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v18.17.1
+v20.10.0
diff --git a/__snapshots__/layout/_template.spec.js.snap b/__snapshots__/layout/_template.spec.js.snap
@@ -138,7 +138,7 @@ exports[`base page template matches the favicons block override snapshot 1`] = `
 
 
 
-    <header class="ons-header " role="banner">
+    <header class="ons-header" role="banner">
 
 
 
@@ -377,7 +377,7 @@ exports[`base page template matches the footer block override snapshot 1`] = `
 
 
 
-    <header class="ons-header " role="banner">
+    <header class="ons-header" role="banner">
 
 
 
@@ -641,7 +641,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `
 
 
 
-    <header class="ons-header  ons-header--neutral" role="banner">
+    <header class="ons-header ons-header--neutral" role="banner">
 
 
 
@@ -876,8 +876,8 @@ exports[`base page template matches the full configuration snapshot 1`] = `
                     <ul class="ons-header-service-nav__list">
 
                             <li class="ons-header-service-nav__item ons-header-service-nav__item--mobile">
-
 
+
 
 
 
@@ -889,17 +889,17 @@ exports[`base page template matches the full configuration snapshot 1`] = `
         </svg>
 
 
-
-
-                                Jacky Turner
-
+                                
+                                
+                                    Jacky Turner
+                                
                             </li>
 
                             <li class="ons-header-service-nav__item ons-header-service-nav__item--mobile">
-
-
-                                <a href="#0" class="ons-header-service-nav__link">Sign out</a>
-
+                                
+                                
+                                    <a href="#0" class="ons-header-service-nav__link">Sign out</a>
+                                
                             </li>
 
                     </ul>
@@ -1930,7 +1930,7 @@ exports[`base page template matches the meta block override snapshot 1`] = `
 
 
 
-    <header class="ons-header " role="banner">
+    <header class="ons-header" role="banner">
 
 
 
@@ -2153,7 +2153,7 @@ exports[`base page template matches the social block override snapshot 1`] = `
 
 
 
-    <header class="ons-header " role="banner">
+    <header class="ons-header" role="banner">
 
 
 

diff --git a/src/components/header/_header.scss b/src/components/header/_header.scss
@@ -229,4 +229,8 @@
       margin-top: -5px !important;
     }
   }
+
+  .ons-btn {
+    top: 0 !important;
+  }
 }
diff --git a/src/components/header/_macro.njk b/src/components/header/_macro.njk
@@ -12,7 +12,7 @@
         {% set currentLanguageISOCode = currentLanguage.ISOCode %}
     {% endif %}
 
-    <header class="ons-header {% if params.classes %} {{ params.classes }}{% endif %}{% if params.variants is not string %}{% for variant in params.variants %} ons-header--{{ variant }}{% endfor %}{% else %} ons-header--{{ params.variants }}{% endif %}" role="banner">
+    <header class="ons-header{% if params.classes %} {{ params.classes }}{% endif %}{% if params.variants is not string %}{% for variant in params.variants %} ons-header--{{ variant }}{% endfor %}{% else %} ons-header--{{ params.variants }}{% endif %}" role="banner">
         {{
             onsBrowserBanner({
                 "lang": currentLanguageISOCode,
@@ -141,22 +141,22 @@
                     <ul class="ons-header-service-nav__list">
                         {% for item in params.serviceLinks.itemsList %}
                             <li class="ons-header-service-nav__item ons-header-service-nav__item--mobile">
-                            {% if item.iconType %}
-                                {{
-                                    onsIcon({
-                                        "iconType": item.iconType
-                                    })
-                                }}
-                            {% endif %}
-                            {% if item.url %}
-                                <a
-                                    href="{{ item.url }}"
-                                    class="ons-header-service-nav__link"
-                                    {% if item.id %} id="{{ item.id }}"{% endif %}
-                                >{% if item.title %}{{ item.title }}{% elif item.text %}{{ item.text }}{% endif %}</a>
-                            {% else %}
-                                {% if item.title %}{{ item.title }}{% elif item.text %}{{ item.text }}{% endif %}
-                            {% endif %}
+                                {% if item.iconType %}
+                                    {{
+                                        onsIcon({
+                                            "iconType": item.iconType
+                                        })
+                                    }}
+                                {% endif %}
+                                {% if item.url %}
+                                    <a
+                                        href="{{ item.url }}"
+                                        class="ons-header-service-nav__link"
+                                        {% if item.id %} id="{{ item.id }}"{% endif %}
+                                    >{% if item.title %}{{ item.title }}{% elif item.text %}{{ item.text }}{% endif %}</a>
+                                {% else %}
+                                    {% if item.title %}{{ item.title }}{% elif item.text %}{{ item.text }}{% endif %}
+                                {% endif %}
                             </li>
                         {% endfor %}
                     </ul>