Make Page template options besides header and footer follow conventions #6538
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
govuk-design-system-ci
temporarily deployed
to
govuk-frontend-pr-6538
romaricpascal
changed the title
📋 StatsNo changes to any distributed file sizes! Action run for c6be984 |
govuk-design-system-ci
temporarily deployed
to
govuk-frontend-pr-6538
romaricpascal
force-pushed
the
page-template-follow-conventions
branch
from
6a83be7 to
aa7d107
Compare
govuk-design-system-ci
temporarily deployed
to
govuk-frontend-pr-6538
querkmachine
approved these changes
Dec 11, 2025
Member
querkmachine
left a comment
querkmachine
left a comment
There was a problem hiding this comment.
Some minor formatting fixes but otherwise looks good to me
| }) | ||
|
|
||
| it('can have content injected before it using the beforeContent block', () => { | ||
| it('can be overridden using the main block', () => { |
Member
There was a problem hiding this comment.
Suggested change
| it('can be overridden using the main block', () => { | |
| it('can be overridden using the `main` block', () => { |
Adding backticks around the block name for consistency with the other tests.
CHANGELOG.md
Outdated
| #### Use the `container` block instead of the `main` block to replace the width container | ||
|
|
||
| We've reduced the scope of the `main` block to only replace the `<main>` element, | ||
| rather than the whole `<div class="govuk-width-container"> element. |
Member
There was a problem hiding this comment.
Suggested change
| rather than the whole `<div class="govuk-width-container"> element. | |
| rather than the whole `<div class="govuk-width-container">` element. |
Missing a backtick here
…ner">` element It'll replace the `main` block whose scope will be restricted to overriding the `<main>` element.
The `main` name doesn't represent what the block was actually changing (the `<div class="govuk-width-container">`), so there should be less surprises for users now it overrides only `main`.
This aligns with the `<ELEMENT_NAME>Start` convention. The legacy `beforeContent` block can still be used but when both are present the new `containerStart` block takes precedence.
Add content at the end of the `<div class="govuk-width-container">` element, allowing for example to close tags opened in the `containerStart` blocks.
For consistency with the other elements of the page template
Follows the convention that blocks replacing the components have the same name as the macro for the component.
Follow our upgrade guide for the breaking change
Follow our recommended changes
Follow our recommended changes
romaricpascal
force-pushed
the
page-template-follow-conventions
branch
from
aa7d107 to
c6be984
Compare
govuk-design-system-ci
temporarily deployed
to
govuk-frontend-pr-6538
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates the blocks and variables not related to the
headerandfooterso they follow the same conventions, with the relevant associated tests.containerblock wrapping the<div class="govuk-width-container">element to replace the currentmainblock<main>tagbeforeContentblock in favour of acontainerStartblock for adding content at the start of the<div class="govuk-width-container">elementcontainerEndblock for adding content at the end of the<div class="govuk-width-container">elementcontainerAttributesvariable to add attributes to the<div class="govuk-width-container">elementmainAttributesvariable to add attributes to the<main>elementskipLinkblock in favour of agovukSkipLinkblockCloses #6535.