From 51b1929b5d4a6afca5f5297cb5c0f0cef263a0fa Mon Sep 17 00:00:00 2001 From: Frankie Roberto Date: Fri, 29 Nov 2024 11:10:51 +0000 Subject: [PATCH] Fix changelog merge --- CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84a9ca07d..5217dda24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,6 @@ - Fix appearance of disabled warning buttons ([Issue 1034]([https://github.com/nhsuk/nhsuk-service-manual-community-backlog/issues/1034])) - Fix reverse button text colour ([PR 1080]([https://github.com/nhsuk/nhsuk-frontend/pull/1080])) -## 9.1.0 - 4 November 2024 - -:new: **New features** - -- Add task list component ([PR 969](https://github.com/nhsuk/nhsuk-frontend/pull/969)) - :wrench: **Fixes** - Remove the boolean `showNav`, `showSearch` and `transactional` options from the header component. Respective parts of the header are now shown if values for `primaryLinks`, `search` or `transactionalService` options are provided. Additionally, the `searchAction` option is renamed `search.action` and the `searchInputName` option is renamed `search.name`. Finally, the label, button and placeholder text for the search input can be updated using the new `search.visuallyHiddenLabel`, `search.visuallyHiddenButton` and `search.placeholder` options. ([PR 996](https://github.com/nhsuk/nhsuk-frontend/pull/996)) @@ -41,6 +35,12 @@ ``` +## 9.1.0 - 4 November 2024 + + :new: **New features** + + - Add task list component ([PR 969](https://github.com/nhsuk/nhsuk-frontend/pull/969)) + ## 9.0.1 - 9 October 2024 :wrench: **Fixes**