diff --git a/README.md b/README.md index 1ff85fcd..517bc1d0 100644 --- a/README.md +++ b/README.md @@ -153,12 +153,6 @@ Find more information [here](https://docs.github.com/en/enterprise-server@3.6/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) for setting up presonal access tokens. -## GDS templates - -These have been committed to the repo, but if you need these updated you can update -the [templates](./templates.sh) script and rerun it. -Update the version when necessary. - ## M series Macbook/Colima development setup ### Prerequisites @@ -239,7 +233,7 @@ To check the current Docker context, use: docker context show ``` -## Recreating frontend static resources +## Recreating frontend static resources (GDS & MoJ templates) > **_INFORMATION:_** When cloning this project for the first time, you do not need > to run gulp as the static resources should already be created within the project. diff --git a/gulpfile.js b/gulpfile.js index 159d9eb6..8919455d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -22,7 +22,8 @@ function copyGOVUKJavaScript() { .pipe(rename('all.js')) // Add spring context path to asset locations .pipe(replace('/assets/', '/civil/assets/')) - .pipe(gulp.dest('./src/main/resources/static/js/'), {overwrite: true} ); + .pipe(gulp.dest('./src/main/resources/static/govuk-frontend/'), + {overwrite: true}); } function copyGOVUKAssets(){ @@ -71,6 +72,7 @@ function compileCCMSStyleSheets(){ // Will highlight errors in your CSS file incase they are missed .pipe(plumber()) .pipe(sass({ + includePaths: ['node_modules'], outputStyle: "compressed" })) .pipe(plumber.stop()) diff --git a/package-lock.json b/package-lock.json index 19d6527c..2e7e78b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "devDependencies": { "@ministryofjustice/frontend": "^2.2.4", - "govuk-frontend": "^5.3.1", + "govuk-frontend": "^5.7.1", "gulp": "^5.0.0", "gulp-autoprefixer": "^9.0.0", "gulp-minify": "^3.1.0", diff --git a/package.json b/package.json index 97824859..320937c3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "devDependencies": { "@ministryofjustice/frontend": "^2.2.4", - "govuk-frontend": "^5.3.1", + "govuk-frontend": "^5.7.1", "gulp": "^5.0.0", "gulp-autoprefixer": "^9.0.0", "gulp-minify": "^3.1.0", diff --git a/src/main/resources/scss/component/spinner.scss b/src/main/resources/scss/component/spinner.scss index ea17862b..3f9eca11 100644 --- a/src/main/resources/scss/component/spinner.scss +++ b/src/main/resources/scss/component/spinner.scss @@ -1,7 +1,9 @@ +@use "node_modules/govuk-frontend/dist/govuk/settings/colours-palette"; + .loader { margin: auto; border: 12px solid #dee0e2; - border-top: 12px solid #1d70b8; + border-top: 12px solid map-get($govuk-colours, "blue"); border-radius: 50%; width: 80px; height: 80px; @@ -11,7 +13,7 @@ .loader-small { margin: auto; border: 4px solid #dee0e2; - border-top: 4px solid #1d70b8; + border-top: 4px solid map-get($govuk-colours, "blue"); border-radius: 50%; width: 20px; height: 20px; diff --git a/src/main/resources/static/assets/images/govuk-crest-2x.png b/src/main/resources/static/assets/images/govuk-crest-2x.png deleted file mode 100644 index 78e751cc..00000000 Binary files a/src/main/resources/static/assets/images/govuk-crest-2x.png and /dev/null differ diff --git a/src/main/resources/static/assets/images/govuk-crest.png b/src/main/resources/static/assets/images/govuk-crest.png deleted file mode 100644 index bed4efe4..00000000 Binary files a/src/main/resources/static/assets/images/govuk-crest.png and /dev/null differ diff --git a/src/main/resources/static/govuk-frontend/all.js b/src/main/resources/static/govuk-frontend/all.js index a2d459b4..42064160 100644 --- a/src/main/resources/static/govuk-frontend/all.js +++ b/src/main/resources/static/govuk-frontend/all.js @@ -1 +1 @@ -const version="5.3.1";function normaliseString(e,t){const s=e?e.trim():"";let n,i=null==t?void 0:t.type;switch(i||(["true","false"].includes(s)&&(i="boolean"),s.length>0&&isFinite(Number(s))&&(i="number")),i){case"boolean":n="true"===s;break;case"number":n=Number(s);break;default:n=e}return n}function mergeConfigs(...e){const t={};for(const s of e)for(const e of Object.keys(s)){const n=t[e],i=s[e];isObject(n)&&isObject(i)?t[e]=mergeConfigs(n,i):t[e]=i}return t}function extractConfigByNamespace(e,t,s){const n=e.schema.properties[s];if("object"!==(null==n?void 0:n.type))return;const i={[s]:{}};for(const[o,r]of Object.entries(t)){let e=i;const t=o.split(".");for(const[n,i]of t.entries())"object"==typeof e&&(n` from template `