Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CCMSPUI-411: Upgrade GOVUK Frontend to 5.7.1 #304

Merged
merged 12 commits into from
Nov 26, 2024

Conversation

JamieBriggs-MoJ
Copy link
Contributor

@JamieBriggs-MoJ JamieBriggs-MoJ commented Nov 22, 2024

Upgrading GOVUK Frontend from 5.3.1 to 5.7.1.

Changes

5.5.0: GOVUK Frontend includes updated colour palete

Not much change to frontend for this inclusion, rather using the colour palette directly in .scss where a colour is used.

5.6.0: Updated header to use the services component

Screenshot 2024-11-26 at 10 55 15

5.7.0: Crest updated to use King Charles III logo

This change was partially done when CCMSPUI-408 was merged, however part of this PR it's been checked properly.

Before:
Screenshot 2024-11-26 at 11 55 45

After:
Screenshot 2024-11-26 at 11 56 23

Changes to GDS but not to project

Listing changes to GDS which did not effect the project but were worth noting as part of my findings.

  • 5.4.1: Breadcrumbs to use nav instead of div and to add an aria-label which was introduced in.
  • 5.5.0: There is a class now added which helps wrap longer words which would usually trail off screen. You can do this by wrapping the content with the class govuk-!-text-break-word.

Signed-off-by: Jamie Briggs <jamie.briggs@digital.justice.gov.uk>
Signed-off-by: Jamie Briggs <jamie.briggs@digital.justice.gov.uk>
…y/ccmspui-411-govuk-5.7.1

# Conflicts:
#	src/main/resources/scss/ccms.scss
… service navigation component. Fixed references to fragment to be <th:block/> elements to coincide with this change.

Signed-off-by: Jamie Briggs <jamie.briggs@digital.justice.gov.uk>
@JamieBriggs-MoJ JamieBriggs-MoJ marked this pull request as ready for review November 26, 2024 12:06
Signed-off-by: Jamie Briggs <jamie.briggs@digital.justice.gov.uk>
Copy link
Contributor

@farrell-m farrell-m left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@PhilDigitalJustice
Copy link
Contributor

I've just mereged my changes which has a new caab.js file. Are you able to merge the contents of that file into the all.js?

@JamieBriggs-MoJ
Copy link
Contributor Author

I've just mereged my changes which has a new caab.js file. Are you able to merge the contents of that file into the all.js?

@PhilDigitalJustice Not currently. Would need to implement webpack which could be looked into at a later date to combine and compile javascript files into one file

However you did highlight that gulpfile.js is copying all.js from govuk-frontend to the wrong location so have fixed that now

… the correct location

Signed-off-by: Jamie Briggs <jamie.briggs@digital.justice.gov.uk>
Copy link
Contributor

@PhilDigitalJustice PhilDigitalJustice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@JamieBriggs-MoJ JamieBriggs-MoJ merged commit 9e62bac into main Nov 26, 2024
1 check passed
@JamieBriggs-MoJ JamieBriggs-MoJ deleted the story/ccmspui-411-govuk-5.7.1 branch November 26, 2024 14:15
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