Skip to content

Commit

Permalink
Merge branch 'main' into remove-unused-scss-breadcrumbs
Browse files Browse the repository at this point in the history
  • Loading branch information
anandamaryon1 authored Jun 10, 2024
2 parents 492c372 + d06848f commit 6370cc2
Show file tree
Hide file tree
Showing 29 changed files with 2,480 additions and 697 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# NHS.UK frontend Changelog

## Unreleased

:wrench: **Fixes**

- Align label bottom margins with fieldset legend bottom margins ([PR 946](https://github.com/nhsuk/nhsuk-frontend/pull/946)).
- Adds `opacity: 1` to header search placeholder, to increase colour contrast on firefox.
- Adds aria-hidden to labels in responsive tables that show only on small screens, to avoid screenreaders calling out them out twice ([PR 942](https://github.com/nhsuk/nhsuk-frontend/pull/942)).
- Removing classes from icon card that are not doing anything.
- Align label bottom margins with fieldset legend bottom margins ([PR 946](https://github.com/nhsuk/nhsuk-frontend/pull/946)).
- Fixed bug with inset-text component requiring uppercase `html` argument. Fixes ([Issue 950](https://github.com/nhsuk/nhsuk-frontend/issues/950)).

## 8.1.1 - 14 March 2024

:wrench: **Fixes**
Expand Down
2 changes: 1 addition & 1 deletion app/components/inset-text/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
{{ insetText({
"HTML": "<p>You can report any suspected side effect to the <a href=\"https://yellowcard.mhra.gov.uk/\" title=\"External website\">UK safety scheme</a>.</p>"
"html": "<p>You can report any suspected side effect to the <a href=\"https://yellowcard.mhra.gov.uk/\" title=\"External website\">UK safety scheme</a>.</p>"
}) }}
</div>
</div>
Expand Down
39 changes: 39 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
trigger:
branches:
include:
- review-*
paths:
exclude:
- CHANGELOG.md
- README.md
- CODE_OF_CONDUCT.md
- CONTRIBUTING.md
pr: none

pool:
vmImage: 'ubuntu-latest'

steps:
- script: npm ci
displayName: 'Install'

- script: npm run build
displayName: 'Build'

- script: npm run lint
displayName: 'Lint'

- script: npm run test
displayName: 'Test'

- script: npm run backstop:ci
displayName: 'Backstop'

- task: ArchiveFiles@2
inputs:
rootFolderOrFile: '$(System.DefaultWorkingDirectory)'
includeRootFolder: false
displayName: 'Create file archive to publish'

- task: PublishBuildArtifacts@1
displayName: 'Publish files to Azure Pipelines'
Loading

0 comments on commit 6370cc2

Please sign in to comment.