From f101c48a1eabc4b748f39f0080e2ab9477138aa8 Mon Sep 17 00:00:00 2001 From: "Mulberry, Tiernan" Date: Thu, 7 Mar 2024 12:01:28 +0000 Subject: [PATCH] reverting back frontend package update --- package.json | 2 +- runner/package.json | 2 +- runner/src/client/sass/_govuk.scss | 2 +- runner/src/client/sass/_hmpo.scss | 9 +++++---- runner/src/client/sass/_upload-dialog.scss | 2 +- runner/src/client/sass/application.scss | 8 ++++---- runner/src/client/sass/modal-dialog.scss | 2 +- yarn.lock | 12 ++++++------ 8 files changed, 20 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 2b70743977..c86453f37e 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ }, "dependencies": { "@babel/runtime": "^7.11.2", - "govuk-frontend": "^5.2.0", + "govuk-frontend": "^4.3.1", "hmpo-components": "^5.2.1" }, "resolutions": { diff --git a/runner/package.json b/runner/package.json index 18b50cd9ac..3d16f74049 100644 --- a/runner/package.json +++ b/runner/package.json @@ -61,7 +61,7 @@ "config": "^3.3.7", "dotenv": "8.2.0", "expr-eval": "^2.0.2", - "govuk-frontend": "^5.2.0", + "govuk-frontend": "^4.3.1", "hapi-pino": "8.0.0", "hapi-pulse": "3.0.0", "hapi-rate-limit": "4.1.0", diff --git a/runner/src/client/sass/_govuk.scss b/runner/src/client/sass/_govuk.scss index 1c9ce0d2fb..a6d659881b 100644 --- a/runner/src/client/sass/_govuk.scss +++ b/runner/src/client/sass/_govuk.scss @@ -1,3 +1,3 @@ $govuk-global-styles: true; -@import "../../../node_modules/govuk-frontend/dist/govuk/all"; +@import "node_modules/govuk-frontend/govuk/all"; diff --git a/runner/src/client/sass/_hmpo.scss b/runner/src/client/sass/_hmpo.scss index 0a9b919d8e..7c77f1df7e 100644 --- a/runner/src/client/sass/_hmpo.scss +++ b/runner/src/client/sass/_hmpo.scss @@ -1,6 +1,6 @@ -@import "../../../node_modules/hmpo-components/assets/stylesheets/mixins"; -@import "../../../node_modules/hmpo-components/components/hmpo-circle-step/style"; -@import "../../../node_modules/hmpo-components/components/hmpo-flash-card/style"; +@import "node_modules/hmpo-components/assets/stylesheets/mixins"; +@import "node_modules/hmpo-components/components/hmpo-circle-step/style"; +@import "node_modules/hmpo-components/components/hmpo-flash-card/style"; /* from "hmpo-components/assets/stylesheets/_typeography.scss" * fixes typography for circle steps. The whole file messes up confirmation/panel. @@ -14,7 +14,8 @@ main ul { h2 { margin-bottom: 0; } - h2, p { + h2, + p { margin-top: 0; } .circle-step-circle { diff --git a/runner/src/client/sass/_upload-dialog.scss b/runner/src/client/sass/_upload-dialog.scss index fff3e4d767..8535c4c0cc 100644 --- a/runner/src/client/sass/_upload-dialog.scss +++ b/runner/src/client/sass/_upload-dialog.scss @@ -1,4 +1,4 @@ -@import "../../../node_modules/govuk-frontend/dist/govuk/helpers/colour.scss"; +@import "node_modules/govuk-frontend/govuk/helpers/colour"; .upload-dialog { display: none; diff --git a/runner/src/client/sass/application.scss b/runner/src/client/sass/application.scss index cbc04ca051..d141ea8620 100644 --- a/runner/src/client/sass/application.scss +++ b/runner/src/client/sass/application.scss @@ -1,5 +1,5 @@ @import "govuk"; -@import "../../../node_modules/accessible-autocomplete/src/autocomplete"; +@import "node_modules/accessible-autocomplete/src/autocomplete"; @import "hmpo"; @import "modal-dialog"; @import "upload-dialog"; @@ -77,6 +77,6 @@ fill: white; } -.govuk-phase-banner__content__tag { - text-transform: capitalize; -} +// .govuk-phase-banner__content__tag { +// text-transform: capitalize; +// } diff --git a/runner/src/client/sass/modal-dialog.scss b/runner/src/client/sass/modal-dialog.scss index 54051b45ea..a57cbc4a8a 100644 --- a/runner/src/client/sass/modal-dialog.scss +++ b/runner/src/client/sass/modal-dialog.scss @@ -1,4 +1,4 @@ -@import "../../../node_modules/govuk-frontend/dist/govuk/all.scss"; +@import "node_modules/govuk-frontend/govuk/all"; .modal-dialog { // Don't display modal if user doesn't have js. Can be overriden with .modal-dialog--no-js-persistent display: none; diff --git a/yarn.lock b/yarn.lock index 68ee8102b2..1e2ac934be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5131,7 +5131,7 @@ __metadata: expr-eval: ^2.0.2 flat: 5.0.2 form-data: ^4.0.0 - govuk-frontend: ^5.2.0 + govuk-frontend: ^4.3.1 hapi-pino: 8.0.0 hapi-pulse: 3.0.0 hapi-rate-limit: 4.1.0 @@ -8602,7 +8602,7 @@ __metadata: eslint-plugin-prettier: ^4.2.1 eslint-plugin-promise: ^4.2.1 eslint-plugin-tsdoc: ^0.2.14 - govuk-frontend: ^5.2.0 + govuk-frontend: ^4.3.1 hmpo-components: ^5.2.1 husky: ^4.3.0 lint-staged: ^10.4.2 @@ -11362,10 +11362,10 @@ __metadata: languageName: node linkType: hard -"govuk-frontend@npm:^5.2.0": - version: 5.2.0 - resolution: "govuk-frontend@npm:5.2.0" - checksum: aabf67174acdd77dea3033612999c99b501dce2bf20dd01a4d45c2de2e157694334c5c1fb2868dd9e0049f385deed824c96385898adfb5d11e2e3a55787f93fe +"govuk-frontend@npm:^4.3.1": + version: 4.8.0 + resolution: "govuk-frontend@npm:4.8.0" + checksum: e255f924f399319e109347ec4993e0441fc5847a6a73ba44a465b1599c7d03e85c29212743b081ccd60e19224c6301143c77540b8e4bfe615fcb3e162b8663f4 languageName: node linkType: hard