Skip to content

Switch on rebrand#2077

Merged
DavidBiddle merged 7 commits into
mainfrom
apply-rebrand
Jul 18, 2025
Merged

Switch on rebrand#2077
DavidBiddle merged 7 commits into
mainfrom
apply-rebrand

Conversation

@DavidBiddle

@DavidBiddle DavidBiddle commented Jul 16, 2025

Copy link
Copy Markdown
Contributor

What problem does this pull request solve?

Trello card: https://trello.com/c/pxwEDVou/2384-apply-rebrand-to-forms-admin

Switches on the rebrand styles in forms-admin.

Also includes a small change to the way we display the header on non-prod environments. See individual commits for details.

Will supersede #2043 since it includes the same update to govuk-components.

Screenshots

Header - local environment - before

image

Header - local environment - after

image

Header - dev environment - before

image

Header - dev environment - after

image

Header - prod environment - before

image

Header - prod environment - after

image

Things to consider when reviewing

  • Ensure that you consider the wider context.
  • Does it work when run on your machine?
  • Is it clear what the code is doing?
  • Do the commit messages explain why the changes were made?
  • Are there all the unit tests needed?
  • Do the end to end tests need updating before these changes will pass?
  • Has all relevant documentation been updated?

@DavidBiddle DavidBiddle changed the title Apply rebrand Switch on rebrand Jul 16, 2025
@DavidBiddle DavidBiddle marked this pull request as ready for review July 17, 2025 09:44
@DavidBiddle DavidBiddle changed the title Switch on rebrand DO NOT MERGE: Switch on rebrand Jul 17, 2025
@DavidBiddle DavidBiddle force-pushed the apply-rebrand branch 3 times, most recently from 9cb1594 to 96ec656 Compare July 17, 2025 16:09
@DavidBiddle DavidBiddle changed the title DO NOT MERGE: Switch on rebrand Switch on rebrand Jul 18, 2025
Comment thread app/views/layouts/base.html.erb
dependabot Bot and others added 7 commits July 18, 2025 14:47
Bumps [govuk-components](https://github.com/x-govuk/govuk-components) from 5.10.1 to 5.11.1.
- [Release notes](https://github.com/x-govuk/govuk-components/releases)
- [Commits](x-govuk/govuk-components@v5.10.1...v5.11.1)

---
updated-dependencies:
- dependency-name: govuk-components
  dependency-version: 5.11.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Adds the `govuk-template--rebranded` class to the HTMl so that the new
styles are picked up.
Most of our assets are built, fingerprinted, and moved to the public
folder automatically, but the manifest file and the icons it references
currently need to be copied manually because of an issue with the
fingerprinting.
Updates the icon asset paths in the HTML to point to the new rebrand
assets.
We use the colour of the header border to make it obvious to members of
our team which environment they're using.

The border under the header is much less visible after the rebrand
changes, so here we're:

- increasing the size of the border when one of our custom header CSS
  classes is present.
- changing the dev colour to turquoise, to make it less unpleasant to
  look at
- moving the border to the top of the header instead of underneath it,
  so it interferes less with the header and service navigation.

Also includes a small fix to make the component preview display
correctly.
The header is already blue by default, so adding a blue border doesn't
make a noticeable visual difference. This commit removes the
app-header--blue CSS class and tweaks the component logic to stop it
being added.
We have this in the product page repo so it makes sense to copy it here
for consistency too.
@sonarqubecloud

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

🎉 A review copy of this PR has been deployed! You can reach it at: https://pr-2077.admin.review.forms.service.gov.uk/

It may take 5 minutes or so for the application to be fully deployed and working. If it still isn't ready
after 5 minutes, there may be something wrong with the ECS task. You will need to go to the integration AWS account
to debug, or otherwise ask an infrastructure person.

For the sign in details and more information, see the review apps wiki page.

@DavidBiddle DavidBiddle merged commit 9fc6368 into main Jul 18, 2025
6 checks passed
@DavidBiddle DavidBiddle deleted the apply-rebrand branch July 18, 2025 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants