diff --git a/.github/workflows/build-and-deploy-production.yml b/.github/workflows/build-and-deploy-production.yml index 38d34a51c2..b1579fb2d1 100644 --- a/.github/workflows/build-and-deploy-production.yml +++ b/.github/workflows/build-and-deploy-production.yml @@ -19,10 +19,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup .NET Core SDK 6.0 + - name: Setup .NET Core SDK 8.0 uses: actions/setup-dotnet@v4 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Setup node uses: actions/setup-node@v4 with: diff --git a/.github/workflows/build-and-deploy-uat.yml b/.github/workflows/build-and-deploy-uat.yml index 9a82da00a9..e06b88c727 100644 --- a/.github/workflows/build-and-deploy-uat.yml +++ b/.github/workflows/build-and-deploy-uat.yml @@ -22,10 +22,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup .NET Core SDK 6.0 + - name: Setup .NET Core SDK 8.0 uses: actions/setup-dotnet@v4 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Setup node uses: actions/setup-node@v4 with: diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index d0019ac854..3b0ed25380 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup .NET Core SDK 6.0 + - name: Setup .NET Core SDK 8.0 uses: actions/setup-dotnet@v4 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Add TechnologyEnhancedLearning as nuget package source run: dotnet nuget add source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --name TechnologyEnhancedLearning --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs index 3d67314b55..b73bce21b8 100644 --- a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs @@ -133,7 +133,8 @@ bool zeroBased int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false); - int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify); + int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID); + int AddCustomFlagToFramework(int frameworkId, string flagName, string flagGroup, string flagTagClass); void UpdateFrameworkCustomFlag(int frameworkId, int id, string flagName, string flagGroup, string flagTagClass); @@ -740,7 +741,7 @@ FROM FrameworkCollaborators fc ); } - public int AddCollaboratorToFramework(int frameworkId, string? userEmail, bool canModify) + public int AddCollaboratorToFramework(int frameworkId, string? userEmail, bool canModify, int? centreID) { if (userEmail is null || userEmail.Length == 0) { @@ -763,8 +764,8 @@ FROM FrameworkCollaborators } var adminId = (int?)connection.ExecuteScalar( - @"SELECT AdminID FROM AdminUsers WHERE Email = @userEmail AND Active = 1", - new { userEmail } + @"SELECT AdminID FROM AdminUsers WHERE Email = @userEmail AND Active = 1 AND CentreID = @centreID", + new { userEmail, centreID } ); if (adminId is null) { diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs index 845a00b07c..76a1a199bd 100644 --- a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs @@ -615,6 +615,41 @@ FROM SelfAssessmentResults ); } + public IEnumerable GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency( + int delegateUserId, + int selfAssessmentId, + int competencyId + ) + { + return connection.Query( + @"SELECT + s.ID, + s.SelfAssessmentID, + s.CompetencyID, + s.AssessmentQuestionID, + s.Result, + s.DateTime, + s.SupportingComments, + s.DelegateUserId + FROM SelfAssessmentResults s inner join + SelfAssessmentResultSupervisorVerifications sv ON s.ID = sv.SelfAssessmentResultId AND sv.Superceded = 0 + WHERE s.CompetencyID = @competencyId + AND s.SelfAssessmentID = @selfAssessmentId + AND s.DelegateUserID = @delegateUserId", + new { selfAssessmentId, delegateUserId, competencyId } + ); + } + + public void RemoveReviewCandidateAssessmentOptionalCompetencies(int id) + { + + connection.Execute(@"UPDATE SelfAssessmentResults SET Result = NULL WHERE ID = @id", new { id}); + + connection.Execute( + @"delete from SelfAssessmentResultSupervisorVerifications WHERE SelfAssessmentResultId = @id", new { id }); + + } + private static string PrintResult( int competencyId, int selfAssessmentId, diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs index 0528c7f907..d4b87c6f78 100644 --- a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs @@ -173,6 +173,12 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so bool IsCentreSelfAssessment(int selfAssessmentId, int centreId); bool HasMinimumOptionalCompetencies(int selfAssessmentId, int delegateUserId); int GetSelfAssessmentCategoryId(int selfAssessmentId); + void RemoveReviewCandidateAssessmentOptionalCompetencies(int id); + public IEnumerable GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency( + int delegateUserId, + int selfAssessmentId, + int competencyId + ); } public partial class SelfAssessmentDataService : ISelfAssessmentDataService { diff --git a/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs b/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs index ffb9460299..de09607df3 100644 --- a/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs +++ b/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs @@ -166,7 +166,7 @@ public IActionResult CreateNewFramework(string actionname, int frameworkId = 0) var sessionNewFramework = multiPageFormService.GetMultiPageFormData( MultiPageFormDataFeature.AddNewFramework, TempData - ).GetAwaiter().GetResult(); + ).GetAwaiter().GetResult(); multiPageFormService.SetMultiPageFormData(sessionNewFramework, MultiPageFormDataFeature.AddNewFramework, TempData); detailFramework = sessionNewFramework.DetailFramework; } @@ -252,7 +252,7 @@ public IActionResult SaveNewFramework(string frameworkname, string actionname) { return StatusCode(500); } - var sessionNewFramework = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.AddNewFramework, TempData).GetAwaiter().GetResult(); + var sessionNewFramework = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.AddNewFramework, TempData).GetAwaiter().GetResult(); multiPageFormService.SetMultiPageFormData( sessionNewFramework, MultiPageFormDataFeature.AddNewFramework, @@ -641,7 +641,8 @@ public IActionResult AddCollaborators(string actionname, int frameworkId, bool e [Route("/Frameworks/Collaborators/{actionname}/{frameworkId}/")] public IActionResult AddCollaborator(string actionname, string userEmail, bool canModify, int frameworkId) { - var collaboratorId = frameworkService.AddCollaboratorToFramework(frameworkId, userEmail, canModify); + int? centreID = GetCentreId(); + var collaboratorId = frameworkService.AddCollaboratorToFramework(frameworkId, userEmail, canModify, centreID); if (collaboratorId > 0) { frameworkNotificationService.SendFrameworkCollaboratorInvite(collaboratorId, GetAdminId()); diff --git a/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs b/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs index cac172a725..2234f7d9eb 100644 --- a/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs +++ b/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs @@ -1532,6 +1532,22 @@ ManageOptionalCompetenciesViewModel model ); } } + var optionalCompetency = + (selfAssessmentService.GetCandidateAssessmentOptionalCompetencies(selfAssessmentId, delegateUserId)).Where(x => !x.IncludedInSelfAssessment); + if (optionalCompetency.Any()) + { + foreach (var optinal in optionalCompetency) + { + var selfAssessmentResults = selfAssessmentService.GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(delegateUserId, selfAssessmentId, optinal.Id); + if (selfAssessmentResults.Any()) + { + foreach (var item in selfAssessmentResults) + { + selfAssessmentService.RemoveReviewCandidateAssessmentOptionalCompetencies(item.Id); + } + } + } + } if (model.GroupOptionalCompetenciesChecked != null) { var optionalCompetencies = @@ -1549,7 +1565,7 @@ ManageOptionalCompetenciesViewModel model } } - + return RedirectToAction("SelfAssessmentOverview", new { selfAssessmentId, vocabulary }); } diff --git a/DigitalLearningSolutions.Web/Scripts/index.d.ts b/DigitalLearningSolutions.Web/Scripts/index.d.ts index 02c8508a4e..dba2afa53a 100644 --- a/DigitalLearningSolutions.Web/Scripts/index.d.ts +++ b/DigitalLearningSolutions.Web/Scripts/index.d.ts @@ -1,23 +1,23 @@ -declare module 'nhsuk-frontend/packages/components/header/header' { +declare module 'nhse-tel-frontend/packages/components/header/header' { export default function Header(): void; } -declare module 'nhsuk-frontend/packages/components/skip-link/skip-link' { +declare module 'nhse-tel-frontend/packages/components/skip-link/skip-link' { export default function SkipLink(): void; } -declare module 'nhsuk-frontend/packages/components/details/details' { +declare module 'nhse-tel-frontend/packages/components/details/details' { export default function Details(): void; } -declare module 'nhsuk-frontend/packages/components/radios/radios' { +declare module 'nhse-tel-frontend/packages/components/radios/radios' { export default function Radios(): void; } -declare module 'nhsuk-frontend/packages/components/checkboxes/checkboxes' { +declare module 'nhse-tel-frontend/packages/components/checkboxes/checkboxes' { export default function Checkboxes(): void; } -declare module 'nhsuk-frontend/packages/components/card/card' { +declare module 'nhse-tel-frontend/packages/components/card/card' { export default function Card(): void; } diff --git a/DigitalLearningSolutions.Web/Scripts/nhsuk.ts b/DigitalLearningSolutions.Web/Scripts/nhsuk.ts index 5114afd99e..7ce2b613aa 100644 --- a/DigitalLearningSolutions.Web/Scripts/nhsuk.ts +++ b/DigitalLearningSolutions.Web/Scripts/nhsuk.ts @@ -1,12 +1,12 @@ // Components -import Header from 'nhsuk-frontend/packages/components/header/header'; -import SkipLink from 'nhsuk-frontend/packages/components/skip-link/skip-link'; -import Details from 'nhsuk-frontend/packages/components/details/details'; -import Radios from 'nhsuk-frontend/packages/components/radios/radios'; -import Checkboxes from 'nhsuk-frontend/packages/components/checkboxes/checkboxes'; +import Header from 'nhse-tel-frontend/packages/components/header/header'; +import SkipLink from 'nhse-tel-frontend/packages/components/skip-link/skip-link'; +import Details from 'nhse-tel-frontend/packages/components/details/details'; +import Radios from 'nhse-tel-frontend/packages/components/radios/radios'; +import Checkboxes from 'nhse-tel-frontend/packages/components/checkboxes/checkboxes'; // Polyfills -import 'nhsuk-frontend/packages/polyfills'; +import 'nhse-tel-frontend/packages/polyfills'; import 'core-js/stable'; import 'regenerator-runtime/runtime'; diff --git a/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts b/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts index 3e9eb5ce67..a754f69348 100644 --- a/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts +++ b/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts @@ -1,4 +1,4 @@ -import Details from 'nhsuk-frontend/packages/components/details/details'; +import Details from 'nhse-tel-frontend/packages/components/details/details'; import _ from 'lodash'; import { setUpFilter, filterSearchableElements, IAppliedFilterTag, diff --git a/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts b/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts index 8ef418f1ab..5510674c40 100644 --- a/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts +++ b/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts @@ -1,5 +1,5 @@ import * as _ from 'lodash'; -import Details from 'nhsuk-frontend/packages/components/details/details'; +import Details from 'nhse-tel-frontend/packages/components/details/details'; import { ISearchableData, ISearchableElement, diff --git a/DigitalLearningSolutions.Web/Services/FrameworkService.cs b/DigitalLearningSolutions.Web/Services/FrameworkService.cs index 795e8ba966..78510692db 100644 --- a/DigitalLearningSolutions.Web/Services/FrameworkService.cs +++ b/DigitalLearningSolutions.Web/Services/FrameworkService.cs @@ -127,7 +127,8 @@ bool zeroBased int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId); - int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify); + int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID); + int AddCustomFlagToFramework(int frameworkId, string flagName, string flagGroup, string flagTagClass); void UpdateFrameworkCustomFlag(int frameworkId, int id, string flagName, string flagGroup, string flagTagClass); @@ -267,9 +268,9 @@ public FrameworkService(IFrameworkDataService frameworkDataService) this.frameworkDataService = frameworkDataService; } - public int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify) + public int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID) { - return frameworkDataService.AddCollaboratorToFramework(frameworkId, userEmail, canModify); + return frameworkDataService.AddCollaboratorToFramework(frameworkId, userEmail, canModify, centreID); } public void AddCompetencyAssessmentQuestion(int frameworkCompetencyId, int assessmentQuestionId, int adminId) diff --git a/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs b/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs index 37b44e8e34..ce7afea305 100644 --- a/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs +++ b/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs @@ -150,7 +150,17 @@ public int GetSelfAssessmentActivityDelegatesExportCount(string searchString, st bool IsCentreSelfAssessment(int selfAssessmentId, int centreId); bool HasMinimumOptionalCompetencies(int selfAssessmentId, int delegateUserId); public int GetSelfAssessmentCategoryId(int selfAssessmentId); - + IEnumerable GetSelfAssessmentResultsForDelegateSelfAssessmentCompetency( + int delegateUserId, + int selfAssessmentId, + int competencyId + ); + public IEnumerable GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency( + int delegateUserId, + int selfAssessmentId, + int competencyId + ); + void RemoveReviewCandidateAssessmentOptionalCompetencies(int id); } public class SelfAssessmentService : ISelfAssessmentService @@ -575,5 +585,25 @@ public int GetSelfAssessmentCategoryId(int selfAssessmentId) { return selfAssessmentDataService.GetSelfAssessmentCategoryId(selfAssessmentId); } + public IEnumerable GetSelfAssessmentResultsForDelegateSelfAssessmentCompetency( + int delegateUserId, + int selfAssessmentId, + int competencyId + ) + { + return selfAssessmentDataService.GetSelfAssessmentResultsForDelegateSelfAssessmentCompetency(delegateUserId, selfAssessmentId, competencyId); + } + public IEnumerable GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency( + int delegateUserId, + int selfAssessmentId, + int competencyId + ) + { + return selfAssessmentDataService.GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(delegateUserId, selfAssessmentId, competencyId); + } + public void RemoveReviewCandidateAssessmentOptionalCompetencies(int id) + { + selfAssessmentDataService.RemoveReviewCandidateAssessmentOptionalCompetencies(id); + } } } diff --git a/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss b/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss index 9bb0b2337c..fb855d2611 100644 --- a/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss +++ b/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .nhsuk-card.comment { border-width: medium; diff --git a/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss b/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss index b452ab9178..9b9cac6d75 100644 --- a/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss +++ b/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "../shared/headingButtons" as *; @use "../shared/searchableElements/searchableElements" as *; $nhs-dark-grey: #425563; diff --git a/DigitalLearningSolutions.Web/Styles/home/Policies.scss b/DigitalLearningSolutions.Web/Styles/home/Policies.scss index f9693e16c3..77caf6c344 100644 --- a/DigitalLearningSolutions.Web/Styles/home/Policies.scss +++ b/DigitalLearningSolutions.Web/Styles/home/Policies.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .custom-ordered-list { list-style: none; diff --git a/DigitalLearningSolutions.Web/Styles/home/brands.scss b/DigitalLearningSolutions.Web/Styles/home/brands.scss index d0fe3aca55..87bdd1bdcc 100644 --- a/DigitalLearningSolutions.Web/Styles/home/brands.scss +++ b/DigitalLearningSolutions.Web/Styles/home/brands.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "../shared/cardWithButtons"; @use "../shared/searchableElements/searchableElements"; diff --git a/DigitalLearningSolutions.Web/Styles/home/learningContent.scss b/DigitalLearningSolutions.Web/Styles/home/learningContent.scss index ba1d801448..5334a5f8dd 100644 --- a/DigitalLearningSolutions.Web/Styles/home/learningContent.scss +++ b/DigitalLearningSolutions.Web/Styles/home/learningContent.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .learning-content-item { margin-bottom: 72px; diff --git a/DigitalLearningSolutions.Web/Styles/home/products.scss b/DigitalLearningSolutions.Web/Styles/home/products.scss index 998efb2b89..f372734819 100644 --- a/DigitalLearningSolutions.Web/Styles/home/products.scss +++ b/DigitalLearningSolutions.Web/Styles/home/products.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .product { margin-bottom: 72px; diff --git a/DigitalLearningSolutions.Web/Styles/home/welcome.scss b/DigitalLearningSolutions.Web/Styles/home/welcome.scss index 31579d6d15..51c14ac8c8 100644 --- a/DigitalLearningSolutions.Web/Styles/home/welcome.scss +++ b/DigitalLearningSolutions.Web/Styles/home/welcome.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .welcome-page-button-container { margin-bottom: 32px; diff --git a/DigitalLearningSolutions.Web/Styles/index.scss b/DigitalLearningSolutions.Web/Styles/index.scss index 536dd107e8..987c59e75b 100644 --- a/DigitalLearningSolutions.Web/Styles/index.scss +++ b/DigitalLearningSolutions.Web/Styles/index.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; $iframe-padding-bottom: nhsuk-spacing(8) * 2; diff --git a/DigitalLearningSolutions.Web/Styles/layout.scss b/DigitalLearningSolutions.Web/Styles/layout.scss index 3f5481951e..6ec87cccb2 100644 --- a/DigitalLearningSolutions.Web/Styles/layout.scss +++ b/DigitalLearningSolutions.Web/Styles/layout.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "shared/breakpoints" as *; html { diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss index 0fe2bbebac..ef089148f7 100644 --- a/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss +++ b/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss @@ -1,5 +1,5 @@ -@use "nhsuk-frontend/packages/core/all" as *; -@import "nhsuk-frontend/packages/components/tag/_tag"; +@use "nhse-tel-frontend/packages/core/all" as *; +@import "nhse-tel-frontend/packages/components/tag/_tag"; .learning-menu-card { border: none; diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss index e4e0609a51..415d8c11fb 100644 --- a/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss +++ b/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .float-right-additional-information { @include mq($until: desktop) { diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss index 4c8704e83b..7fe9a1f15f 100644 --- a/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss +++ b/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .objectives-card { @include nhsuk-typography-responsive(19); diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss index 16de6115f9..6bdede8d2c 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss @@ -4,7 +4,7 @@ // Author: Darlan Rod https://github.com/darlanrod // Version 1.5.2 // MIT License -@use "nhsuk-frontend/packages/core/settings/colours" as *; +@use "nhse-tel-frontend/packages/core/settings/colours" as *; $track-color: $color_nhsuk-grey-3 !default; $thumb-color: $color_nhsuk-grey-2 !default; diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss index 24f7f84c81..0752002412 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements"; .searchable-element { diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss index f863e0704b..517a0ad04d 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "courses"; .searchable-element { diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss index b6ae38acdb..053c1834c6 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss @@ -1,5 +1,5 @@ @use "inputrange" as *; -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "courses" as *; @use "../shared/breakpoints" as *; @use "../shared/searchableElements/searchableElements" as *; diff --git a/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss b/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss index dfc1dd0653..c13339e4a9 100644 --- a/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss +++ b/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .centre-role-tags { display: flex; diff --git a/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss b/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss index 6f5e328562..4d3b2a5381 100644 --- a/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss +++ b/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .top-spaced-goback { margin-top: 32px; diff --git a/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss b/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss index e5fc52d701..ab6bd89c42 100644 --- a/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss +++ b/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .update-notification-hint { margin-bottom: 24px; diff --git a/DigitalLearningSolutions.Web/Styles/nhsuk.scss b/DigitalLearningSolutions.Web/Styles/nhsuk.scss index 923e5a0f90..c2b4c7239b 100644 --- a/DigitalLearningSolutions.Web/Styles/nhsuk.scss +++ b/DigitalLearningSolutions.Web/Styles/nhsuk.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/nhsuk" as *; +@use "nhse-tel-frontend/packages/nhsuk" as *; .nhsuk-u-margin-right-auto { margin-right: auto; diff --git a/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss b/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss index 8fea2fee90..ef2745ce14 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .card-with-buttons { background-color: #fff; diff --git a/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss b/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss index 85223ddca7..255c6594fd 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .nhsuk-button.expander-card__button { margin-right: nhsuk-spacing(2); diff --git a/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss b/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss index 9765e1a925..450c89de63 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "breakpoints" as *; .heading-button-group { diff --git a/DigitalLearningSolutions.Web/Styles/shared/reports.scss b/DigitalLearningSolutions.Web/Styles/shared/reports.scss index ac51923da8..4efbdc04c3 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/reports.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/reports.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "chartist/dist/scss/chartist"; $dark-blue: #005EB8; diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss index a00f280936..b19b0a1714 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "../breakpoints"; $nhs-dark-grey: #425563; diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss index 2dc8f57458..172711ce20 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use '../../shared/searchableElements/common' as *; .filter-container { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss index 858ac80988..81759368ca 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "common" as *; .items-per-page-box-container { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss index 5e68080302..8f16fb41bf 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "common" as *; .pagination-hidden { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss index 6efa24de25..c2f9e07982 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "common" as *; .search-box-container { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss index ed9cffb715..54f2998317 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "common" as *; .sort-box-container { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss index 2a7833b16b..1a8f147f28 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "common" as *; .tags { diff --git a/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss b/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss index 894923386b..6e26b6c05d 100644 --- a/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss +++ b/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .launch-resource-button { text-decoration: none; diff --git a/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss b/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss index 883fe85c1e..ae4735b585 100644 --- a/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss +++ b/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements" as *; @use "../shared/breakpoints" as *; diff --git a/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss b/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss index 1ffb788996..4193d0c53b 100644 --- a/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss +++ b/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @media (min-width: 48.0625em) { .reports-summary-row__key { diff --git a/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss b/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss index 75ea6c4a4e..61d2e738c7 100644 --- a/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss +++ b/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements" as *; @use "../shared/breakpoints" as *; diff --git a/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss b/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss index 0517a8a154..5f2a05026c 100644 --- a/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss +++ b/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .loggedinuser .card-background { color: $nhsuk-text-color; diff --git a/DigitalLearningSolutions.Web/Styles/support/support.scss b/DigitalLearningSolutions.Web/Styles/support/support.scss index ae363e9c68..4b96c6f5a9 100644 --- a/DigitalLearningSolutions.Web/Styles/support/support.scss +++ b/DigitalLearningSolutions.Web/Styles/support/support.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; ol > li { margin-bottom: nhsuk-spacing(6) diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss index 39efcb6d26..ae5a4c5005 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements" as *; @use "../shared/breakpoints" as *; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss index c940f4aef0..e9c4889712 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .centre-detail-image__downsize { display: block; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss index fca8919028..976182b861 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .dashboard-4-1-card { @include mq($until: large-desktop) { diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss index f34f8e1a8f..ea1e5481d0 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements"; $current-centre-highlight: $color_nhsuk-pale-yellow; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss index 1701c79b41..0e76a46820 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; // The colours here are tied to the colour conversion from percentages // defined in DisplayColourHelper diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss index 6479cc34f0..fd09a260a6 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "../shared/searchableElements/common" as *; .summary-list-right-align-tags { diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss index 52f8f508ef..286d0df9a1 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss @@ -1,5 +1,5 @@ @use "../shared/cardWithButtons"; -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements"; @use "../shared/headingButtons.scss"; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss index 09aa8bedef..3f796924e8 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss @@ -1,4 +1,4 @@ -@use 'nhsuk-frontend/packages/core/all' as *; +@use 'nhse-tel-frontend/packages/core/all' as *; @use '../../shared/searchableElements/searchableElements' as *; @use '../../shared/headingButtons' as *; @use '../../shared/cardWithThreeButtons' as *; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss index 2f75e4afdf..cdf0f48f02 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss @@ -1,2 +1,2 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "../../shared/searchableElements/searchableElements"; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss index 7f5df92a47..5e6484507f 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; dd.nhsuk-summary-list__value { text-align: right; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss index 2646784c26..ccab1d9964 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "../shared/searchableElements/filter" as *; .filter-dropdown { diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss index f66b4c3cdb..cc0aaa6381 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements"; .view-delegate-top-button-group { diff --git a/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss b/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss index bfc1e652a7..b297b18151 100644 --- a/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss +++ b/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhse-tel-frontend/packages/core/all" as *; .feedback-chevron { padding: 0 !important; diff --git a/DigitalLearningSolutions.Web/jest.config.js b/DigitalLearningSolutions.Web/jest.config.js index ef8f2f3f59..6b71079ca8 100644 --- a/DigitalLearningSolutions.Web/jest.config.js +++ b/DigitalLearningSolutions.Web/jest.config.js @@ -174,7 +174,7 @@ module.exports = { // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation transformIgnorePatterns: [ - '/node_modules/(?!nhsuk-frontend/.*)', + '/node_modules/(?!nhse-tel-frontend/.*)', '\\.pnp\\.[^\\/]+$', ], diff --git a/DigitalLearningSolutions.Web/package.json b/DigitalLearningSolutions.Web/package.json index 581c909570..446e2199bd 100644 --- a/DigitalLearningSolutions.Web/package.json +++ b/DigitalLearningSolutions.Web/package.json @@ -31,7 +31,7 @@ "js-cookie": "^3.0.5", "js-search": "^2.0.1", "lodash": "^4.17.20", - "nhsuk-frontend": "^9.1.0", + "nhse-tel-frontend": "^0.0.2", "regenerator-runtime": "^0.14.1" }, "devDependencies": { diff --git a/DigitalLearningSolutions.Web/yarn.lock b/DigitalLearningSolutions.Web/yarn.lock index 74f0c6262c..ddd7a30922 100644 --- a/DigitalLearningSolutions.Web/yarn.lock +++ b/DigitalLearningSolutions.Web/yarn.lock @@ -4598,10 +4598,10 @@ neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -nhsuk-frontend@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/nhsuk-frontend/-/nhsuk-frontend-9.1.0.tgz#f5e4f083aaf3cafd7a19731f6a49f1caf9723cab" - integrity sha512-z2hcZDUDz12hjBTWLasq5lfX+sv2jwZFkUdip8qL9fBQ6qykyQFQ8PjWuBBgQN03IU0wMkV3BBLbwBjFiSxREQ== +nhse-tel-frontend@^0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/nhse-tel-frontend/-/nhse-tel-frontend-0.0.2.tgz#a2788912435fabe5013f6440bee8d1816a2e299b" + integrity sha512-9crniTaODs3uQcRNvmBcAgpS9cwW+34scR3ezGIdCOJ2ikOa+va1t37ZH/QUXgAxk6JIWxoX+Edq+N0PcXgrgA== nice-try@^1.0.4: version "1.0.5"