diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index d5be2a5d..9eee201d 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v3 @@ -46,5 +46,5 @@ jobs: run: | (cd tests/utils && nohup python -m flask run --port 3000 &) wait-for-it localhost:3000 - ./govuk-frontend-diff http://localhost:3000 --govuk-frontend-version=v4.7.0 --ci + ./govuk-frontend-diff http://localhost:3000 --govuk-frontend-version=v4.8.0 --ci diff --git a/CHANGELOG.md b/CHANGELOG.md index 02ed3c8f..7b14e2e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/LandRegistry/govuk-frontend-jinja/compare/2.7.0...main) +## [Unreleased](https://github.com/LandRegistry/govuk-frontend-jinja/compare/2.8.0...main) + +## [2.8.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/2.8.0) - 06/02/2024 + +### Added + +- [GOV.UK Frontend v4.8.0](https://github.com/alphagov/govuk-frontend/releases/tag/v4.8.0) support +- Python 3.12 support + +Thanks to [Will Pearson](https://github.com/whpearson) ## [2.7.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/2.7.0) - 13/07/2023 diff --git a/README.md b/README.md index cdb5538c..917ae575 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # GOV.UK Frontend Jinja Macros [![PyPI version](https://badge.fury.io/py/govuk-frontend-jinja.svg)](https://pypi.org/project/govuk-frontend-jinja/) -![govuk-frontend 4.7.0](https://img.shields.io/badge/govuk--frontend%20version-4.7.0-005EA5?logo=gov.uk&style=flat) +![govuk-frontend 4.8.0](https://img.shields.io/badge/govuk--frontend%20version-4.8.0-005EA5?logo=gov.uk&style=flat) [![Python package](https://github.com/LandRegistry/govuk-frontend-jinja/actions/workflows/python-package.yml/badge.svg)](https://github.com/LandRegistry/govuk-frontend-jinja/actions/workflows/python-package.yml) **GOV.UK Frontend Jinja is a [community tool](https://design-system.service.gov.uk/community/resources-and-tools/) of the [GOV.UK Design System](https://design-system.service.gov.uk/). The Design System team is not responsible for it and cannot support you with using it. Contact the [maintainers](#contributors) directly if you need [help](#support) or you want to request a feature.** @@ -16,6 +16,7 @@ The following table shows the version of GOV.UK Frontend Jinja that you should u | GOV.UK Frontend Jinja Version | Target GOV.UK Frontend Version | | ----------------------------- | ------------------------------ | +| [2.8.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/2.8.0) | [4.8.0](https://github.com/alphagov/govuk-frontend/releases/tag/v4.8.0) | | [2.7.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/2.7.0) | [4.7.0](https://github.com/alphagov/govuk-frontend/releases/tag/v4.7.0) | | [2.6.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/2.6.0) | [4.6.0](https://github.com/alphagov/govuk-frontend/releases/tag/v4.6.0) | | [2.5.0](https://github.com/LandRegistry/govuk-frontend-jinja/releases/tag/2.5.0) | [4.5.0](https://github.com/alphagov/govuk-frontend/releases/tag/v4.5.0) | @@ -79,7 +80,7 @@ There is a test server at `tests/utils/app.py` which you will need to run using You can then run the tests using `govuk-frontend-diff` as follows: ```bash -./govuk-frontend-diff http://localhost:3000 --govuk-frontend-version=v4.0.0 +./govuk-frontend-diff http://localhost:3000 --govuk-frontend-version=v4.8.0 ``` This is all wrapped up in `./test.sh` for simplified running (Requires Docker). diff --git a/govuk_frontend_jinja/templates/components/header/macro.html b/govuk_frontend_jinja/templates/components/header/macro.html index 6de10ad3..a8596121 100644 --- a/govuk_frontend_jinja/templates/components/header/macro.html +++ b/govuk_frontend_jinja/templates/components/header/macro.html @@ -1,43 +1,66 @@ {% macro govukHeader(params) %} {% set menuButtonText = params.menuButtonText if params.menuButtonText else 'Menu' %} +{#- We use an inline SVG for the crown so that we can cascade the +currentColor into the crown whilst continuing to support older browsers +which do not support external SVGs without a Javascript polyfill. This +adds approximately 1kb to every page load. +We use currentColour so that we can easily invert it when printing and +when the focus state is applied. This also benefits users who override +colours in their browser as they will still see the crown. +The SVG needs `focusable="false"` so that Internet Explorer does not +treat it as an interactive element - without this it will be +'focusable' when using the keyboard to navigate. #} + +{% set _stEdwardsCrown %} + + + + +{% endset %} + +{% set _tudorCrown %} + + + + +{% endset %} +