From c83375d03ccd219eca6a54cfc0957b9ec25b0457 Mon Sep 17 00:00:00 2001 From: roshaanbajwa Date: Fri, 6 Oct 2023 16:42:05 +0100 Subject: [PATCH 1/9] fix --- packages/components/header/header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/header/header.js b/packages/components/header/header.js index 11aa6c184..a4520c9aa 100644 --- a/packages/components/header/header.js +++ b/packages/components/header/header.js @@ -109,9 +109,9 @@ class Header { */ openMobileMenu() { - const marginBody = this.mobileMenu.offsetHeight this.menuIsOpen = true this.mobileMenu.classList.remove('nhsuk-header__drop-down--hidden') + const marginBody = this.mobileMenu.offsetHeight this.navigation.style.marginBottom = `${marginBody}px` this.mobileMenuToggleButton.setAttribute('aria-expanded', 'true') From 1f8c5373873c285959fd2348c38eee81842ca041 Mon Sep 17 00:00:00 2001 From: roshaanbajwa Date: Sat, 7 Oct 2023 20:29:41 +0100 Subject: [PATCH 2/9] added missing div --- packages/components/header/template.njk | 54 +++++++++++++------------ 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/packages/components/header/template.njk b/packages/components/header/template.njk index ff7efbeb0..26cc3f812 100644 --- a/packages/components/header/template.njk +++ b/packages/components/header/template.njk @@ -132,32 +132,34 @@ {% if showNav == "true" and params.primaryLinks and showSearch == "false" %} {# close nhsuk-header__container #} - - + +
+ +
{% endif -%} From 5616833ce58a492d94173a3abdcc94c49a4e56a9 Mon Sep 17 00:00:00 2001 From: roshaanbajwa Date: Sat, 7 Oct 2023 21:47:50 +0100 Subject: [PATCH 3/9] remove design principles link --- app/components/header/header-service-name-with-nav.njk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/components/header/header-service-name-with-nav.njk b/app/components/header/header-service-name-with-nav.njk index 538a72508..d4680c3e6 100644 --- a/app/components/header/header-service-name-with-nav.njk +++ b/app/components/header/header-service-name-with-nav.njk @@ -28,10 +28,6 @@ 'url' : '#', 'label' : 'Accessibility' }, - { - 'url' : '#', - 'label' : 'Design principles' - }, { 'url' : '#', 'label' : 'Community and contribution' From 20b1df15927f2a3ff21fcf4b642e88459e5295bf Mon Sep 17 00:00:00 2001 From: roshaanbajwa Date: Sat, 7 Oct 2023 21:59:28 +0100 Subject: [PATCH 4/9] backstop --- ...vigation_0_document_3_Surface_iPad_Pro.png | Bin 19642 -> 19336 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_3_Surface_iPad_Pro.png index be876c3c63dc55b640588c378653f1551075f8ce..9d51b90246eda97ab881edf0c1eddbb0e55ee5b2 100644 GIT binary patch literal 19336 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 z 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≻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 From 4804ad3f660bb3d5950eb5842be562cbda360a25 Mon Sep 17 00:00:00 2001 From: roshaanbajwa Date: Fri, 13 Oct 2023 12:37:08 +0100 Subject: [PATCH 5/9] resolve too many header items edge case --- packages/components/header/_header.scss | 1 - packages/components/header/template.njk | 105 +++++++++++++----------- 2 files changed, 55 insertions(+), 51 deletions(-) diff --git a/packages/components/header/_header.scss b/packages/components/header/_header.scss index 5624e8674..013291d53 100644 --- a/packages/components/header/_header.scss +++ b/packages/components/header/_header.scss @@ -452,7 +452,6 @@ display: flex; @include mq($until: tablet) { - position: relative; z-index: 10; } } diff --git a/packages/components/header/template.njk b/packages/components/header/template.njk index 26cc3f812..1698bd0cb 100644 --- a/packages/components/header/template.njk +++ b/packages/components/header/template.njk @@ -77,33 +77,36 @@ {# close nhsuk-header__container #}
- +
+ +
+ {% endif -%} {% if showSearch == "true" and showNav == "false" %} @@ -134,31 +137,33 @@ {# close nhsuk-header__container #}
- +
+ +
{% endif -%} From c6de88c4f423bf673a3c75b873902ece3a9b893a Mon Sep 17 00:00:00 2001 From: roshaanbajwa Date: Thu, 19 Oct 2023 11:15:55 +0100 Subject: [PATCH 6/9] remove width-container --- packages/components/header/_header.scss | 1 + packages/components/header/template.njk | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/components/header/_header.scss b/packages/components/header/_header.scss index 013291d53..5624e8674 100644 --- a/packages/components/header/_header.scss +++ b/packages/components/header/_header.scss @@ -452,6 +452,7 @@ display: flex; @include mq($until: tablet) { + position: relative; z-index: 10; } } diff --git a/packages/components/header/template.njk b/packages/components/header/template.njk index 1698bd0cb..4049bc6c8 100644 --- a/packages/components/header/template.njk +++ b/packages/components/header/template.njk @@ -77,7 +77,7 @@ {# close nhsuk-header__container #}
-
+ {#
#} -
+ {#
#}
@@ -137,7 +137,7 @@ {# close nhsuk-header__container #}
-
+ {#
#} -
+ {#
#}
{% endif -%} From 3c6a017ad8c1360d85e0f929fa00561fb8034dd4 Mon Sep 17 00:00:00 2001 From: roshaanbajwa Date: Thu, 19 Oct 2023 11:18:18 +0100 Subject: [PATCH 7/9] remove comments --- packages/components/header/template.njk | 104 ++++++++++++------------ 1 file changed, 50 insertions(+), 54 deletions(-) diff --git a/packages/components/header/template.njk b/packages/components/header/template.njk index 4049bc6c8..0e5ae9a20 100644 --- a/packages/components/header/template.njk +++ b/packages/components/header/template.njk @@ -77,33 +77,31 @@ {# close nhsuk-header__container #}
- {#
#} - - {#
#} +
@@ -137,33 +135,31 @@ {# close nhsuk-header__container #}
- {#
#} - - {#
#} +
{% endif -%} From 586bb666b50dc0c69dfcac9b0cbe4c92fac9eb59 Mon Sep 17 00:00:00 2001 From: roshaanbajwa Date: Thu, 19 Oct 2023 11:41:01 +0100 Subject: [PATCH 8/9] changelog and package version --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 890e0cab3..1cfcf9b9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # NHS.UK frontend Changelog +## 8.0.2 - 019 October 2023 + +:wrench: **Fixes** + +- Resolves the bug of the drop down menu covering the main content of the page ([PR 898](https://github.com/nhsuk/nhsuk-frontend/pull/898)). + + ## 8.0.1 - 02 October 2023 :wrench: **Fixes** diff --git a/package-lock.json b/package-lock.json index cb00d502e..eaae0ef9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nhsuk-frontend", - "version": "8.0.0", + "version": "8.0.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nhsuk-frontend", - "version": "8.0.0", + "version": "8.0.2", "license": "MIT", "devDependencies": { "@babel/core": "^7.18.6", diff --git a/package.json b/package.json index 6a3b5e20e..e48a569ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nhsuk-frontend", - "version": "8.0.1", + "version": "8.0.2", "description": "NHS.UK frontend contains the code you need to start building user interfaces for NHS websites and services.", "scripts": { "prepare": "gulp bundle", From 79a10f829f3500696d3c406b3ec86010a50cf957 Mon Sep 17 00:00:00 2001 From: roshaanbajwa Date: Thu, 19 Oct 2023 11:43:12 +0100 Subject: [PATCH 9/9] prettier --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cfcf9b9e..a70b61f8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,6 @@ - Resolves the bug of the drop down menu covering the main content of the page ([PR 898](https://github.com/nhsuk/nhsuk-frontend/pull/898)). - ## 8.0.1 - 02 October 2023 :wrench: **Fixes**