From d605e5265ddcb7aa2b94145e046d68d52e086c3d Mon Sep 17 00:00:00 2001
From: Barry GIBNEY <Barry.GIBNEY@education.gov.uk>
Date: Tue, 24 Sep 2024 09:16:03 +0100
Subject: [PATCH] Govuk-frontend updated

---
 .../Sass/GiasForms/_gias-input-errors.scss    |  6 +-
 .../Assets/Sass/govuk-core.scss               | 18 +++---
 Web/Edubase.Web.UI/Assets/Sass/main.scss      | 63 ++++++++++---------
 Web/Edubase.Web.UI/package-lock.json          |  2 +-
 Web/Edubase.Web.UI/package.json               |  2 +-
 Web/Edubase.Web.UI/webpack.config.js          | 11 +++-
 6 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/Web/Edubase.Web.UI/Assets/Sass/GiasForms/_gias-input-errors.scss b/Web/Edubase.Web.UI/Assets/Sass/GiasForms/_gias-input-errors.scss
index 2f0217ace..52ea57162 100644
--- a/Web/Edubase.Web.UI/Assets/Sass/GiasForms/_gias-input-errors.scss
+++ b/Web/Edubase.Web.UI/Assets/Sass/GiasForms/_gias-input-errors.scss
@@ -1,6 +1,6 @@
 // mapping of the input error styling over the razor className
 .input-validation-error {
-  border: $govuk-border-width-form-element-error solid $govuk-error-colour;
+  border: $govuk-border-width-form-element solid $govuk-error-colour;
 
   &:focus {
     border-color: $govuk-input-border-colour;
@@ -12,7 +12,7 @@
   .govuk-input,
   .govuk-select,
   .govuk-textarea {
-    border: $govuk-border-width-form-element-error solid $govuk-error-colour;
+    border: $govuk-border-width-form-element solid $govuk-error-colour;
 
     &:focus {
       border-color: $govuk-input-border-colour;
@@ -21,7 +21,7 @@
   }
   // LA searches
   .la-id-target {
-    border: $govuk-border-width-form-element-error solid $govuk-error-colour;
+    border: $govuk-border-width-form-element solid $govuk-error-colour;
 
     .govuk-input {
       border: none;
diff --git a/Web/Edubase.Web.UI/Assets/Sass/govuk-core.scss b/Web/Edubase.Web.UI/Assets/Sass/govuk-core.scss
index a4eeaae55..97b6904aa 100644
--- a/Web/Edubase.Web.UI/Assets/Sass/govuk-core.scss
+++ b/Web/Edubase.Web.UI/Assets/Sass/govuk-core.scss
@@ -5,12 +5,12 @@
 $govuk-global-styles: true;
 
 @import "GiasHelpers/all";
-@import "node_modules/govuk-frontend/govuk/base";
-@import "node_modules/govuk-frontend/govuk/core/all";
-@import "node_modules/govuk-frontend/govuk/objects/all";
-@import "node_modules/govuk-frontend/govuk/components/footer/index";
-@import "node_modules/govuk-frontend/govuk/components/header/index";
-@import "node_modules/govuk-frontend/govuk/components/phase-banner/index";
-@import "node_modules/govuk-frontend/govuk/components/skip-link/index";
-@import "node_modules/govuk-frontend/govuk/utilities/all";
-@import "node_modules/govuk-frontend/govuk/overrides/all";
+@import "govuk-frontend/govuk/base";
+@import "govuk-frontend/govuk/core/all";
+@import "govuk-frontend/govuk/objects/all";
+@import "govuk-frontend/govuk/components/footer/index";
+@import "govuk-frontend/govuk/components/header/index";
+@import "govuk-frontend/govuk/components/phase-banner/index";
+@import "govuk-frontend/govuk/components/skip-link/index";
+@import "govuk-frontend/govuk/utilities/all";
+@import "govuk-frontend/govuk/overrides/all";
diff --git a/Web/Edubase.Web.UI/Assets/Sass/main.scss b/Web/Edubase.Web.UI/Assets/Sass/main.scss
index 89cc286eb..aca1f5d07 100644
--- a/Web/Edubase.Web.UI/Assets/Sass/main.scss
+++ b/Web/Edubase.Web.UI/Assets/Sass/main.scss
@@ -2,38 +2,39 @@ $govuk-global-styles: true;
 
 @import "GiasHelpers/all";
 //@import "node_modules/govuk-frontend/govuk/all";
-@import "node_modules/govuk-frontend/govuk/base";
+@import "govuk-frontend/govuk/base";
 //
-@import "node_modules/govuk-frontend/govuk/core/all";
-@import "node_modules/govuk-frontend/govuk/objects/all";
-@import "node_modules/govuk-frontend/govuk/components/footer/index";
-@import "node_modules/govuk-frontend/govuk/components/header/index";
-@import "node_modules/govuk-frontend/govuk/components/skip-link/index";
-@import "node_modules/govuk-frontend/govuk/components/checkboxes/index";
-@import "node_modules/govuk-frontend/govuk/components/radios/index";
-@import "node_modules/govuk-frontend/govuk/components/button/index";
-@import "node_modules/govuk-frontend/govuk/components/label/index";
-@import "node_modules/govuk-frontend/govuk/components/select/index";
-@import "node_modules/govuk-frontend/govuk/components/file-upload/index";
-@import "node_modules/govuk-frontend/govuk/components/fieldset";
-@import "node_modules/govuk-frontend/govuk/components/phase-banner/index";
-@import "node_modules/govuk-frontend/govuk/components/input";
-@import "node_modules/govuk-frontend/govuk/components/date-input/index";
-@import "node_modules/govuk-frontend/govuk/components/textarea/index";
-@import "node_modules/govuk-frontend/govuk/components/error-summary/index";
-@import "node_modules/govuk-frontend/govuk/components/error-message/index";
-@import "node_modules/govuk-frontend/govuk/components/summary-list/index";
-@import "node_modules/govuk-frontend/govuk/components/accordion/index";
-@import "node_modules/govuk-frontend/govuk/components/breadcrumbs/index";
-@import "node_modules/govuk-frontend/govuk/components/back-link/index";
-@import "node_modules/govuk-frontend/govuk/components/details/index";
-@import "node_modules/govuk-frontend/govuk/components/table/index";
-@import "node_modules/govuk-frontend/govuk/components/warning-text/index";
-@import "node_modules/govuk-frontend/govuk/components/notification-banner/index";
-@import "node_modules/govuk-frontend/govuk/components/cookie-banner/index";
-@import "node_modules/govuk-frontend/govuk/utilities/all";
-@import "node_modules/govuk-frontend/govuk/overrides/all";
-@import "node_modules/govuk-frontend/govuk/components/inset-text";
+@import "govuk-frontend/govuk/core/all";
+@import "govuk-frontend/govuk/objects/all";
+@import "govuk-frontend/govuk/components/footer/index";
+@import "govuk-frontend/govuk/components/header/index";
+@import "govuk-frontend/govuk/components/skip-link/index";
+@import "govuk-frontend/govuk/components/checkboxes/index";
+@import "govuk-frontend/govuk/components/radios/index";
+@import "govuk-frontend/govuk/components/button/index";
+@import "govuk-frontend/govuk/components/label/index";
+@import "govuk-frontend/govuk/components/select/index";
+@import "govuk-frontend/govuk/components/file-upload/index";
+@import "govuk-frontend/govuk/components/fieldset";
+@import "govuk-frontend/govuk/components/phase-banner/index";
+@import "govuk-frontend/govuk/components/input";
+@import "govuk-frontend/govuk/components/date-input/index";
+@import "govuk-frontend/govuk/components/textarea/index";
+@import "govuk-frontend/govuk/components/error-summary/index";
+@import "govuk-frontend/govuk/components/error-message/index";
+@import "govuk-frontend/govuk/components/summary-list/index";
+@import "govuk-frontend/govuk/components/accordion/index";
+@import "govuk-frontend/govuk/components/breadcrumbs/index";
+@import "govuk-frontend/govuk/components/back-link/index";
+@import "govuk-frontend/govuk/components/details/index";
+@import "govuk-frontend/govuk/components/table/index";
+@import "govuk-frontend/govuk/components/warning-text/index";
+@import "govuk-frontend/govuk/components/notification-banner/index";
+@import "govuk-frontend/govuk/components/cookie-banner/index";
+@import "govuk-frontend/govuk/utilities/all";
+@import "govuk-frontend/govuk/overrides/all";
+@import "govuk-frontend/govuk/components/inset-text";
+@import "govuk-frontend/govuk/settings/all";
 // GIAS specifics
 @import "GiasGovukOverrides/all";
 @import "GiasHelpers/gias-display";
diff --git a/Web/Edubase.Web.UI/package-lock.json b/Web/Edubase.Web.UI/package-lock.json
index 4d7c8c344..5ca415653 100644
--- a/Web/Edubase.Web.UI/package-lock.json
+++ b/Web/Edubase.Web.UI/package-lock.json
@@ -14,7 +14,7 @@
         "axios": "^1.4.0",
         "extend": "^3.0.2",
         "glob": "^7.1.6",
-        "govuk-frontend": "^3.12.0",
+        "govuk-frontend": "^3.15.0",
         "jquery": "^3.6.0",
         "moment": "^2.29.1"
       },
diff --git a/Web/Edubase.Web.UI/package.json b/Web/Edubase.Web.UI/package.json
index 0c5da7752..922c6a3d2 100644
--- a/Web/Edubase.Web.UI/package.json
+++ b/Web/Edubase.Web.UI/package.json
@@ -54,7 +54,7 @@
     "axios": "^1.4.0",
     "extend": "^3.0.2",
     "glob": "^7.1.6",
-    "govuk-frontend": "^3.12.0",
+    "govuk-frontend": "^3.15.0",
     "jquery": "^3.6.0",
     "moment": "^2.29.1"
   }
diff --git a/Web/Edubase.Web.UI/webpack.config.js b/Web/Edubase.Web.UI/webpack.config.js
index 113d72436..a609c2719 100644
--- a/Web/Edubase.Web.UI/webpack.config.js
+++ b/Web/Edubase.Web.UI/webpack.config.js
@@ -108,7 +108,16 @@ const config = {
               }
             }
           },
-          {loader: 'sass-loader'}
+          {
+            loader: 'sass-loader',
+            options: {
+              sassOptions: {
+                includePaths: [
+                  path.resolve(__dirname, 'node_modules')
+                ],
+              },
+            },
+          },
         ],
       },
       {