diff --git a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj index 0057f8da8d..52e008fb67 100644 --- a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj +++ b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj @@ -88,229 +88,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -370,21 +154,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/DigitalLearningSolutions.Web/Scripts/index.d.ts b/DigitalLearningSolutions.Web/Scripts/index.d.ts index dba2afa53a..afb830f8b6 100644 --- a/DigitalLearningSolutions.Web/Scripts/index.d.ts +++ b/DigitalLearningSolutions.Web/Scripts/index.d.ts @@ -1,23 +1,23 @@ -declare module 'nhse-tel-frontend/packages/components/header/header' { +declare module 'nhsuk-frontend/dist/nhsuk/components/header/header' { export default function Header(): void; } -declare module 'nhse-tel-frontend/packages/components/skip-link/skip-link' { +declare module 'nhsuk-frontend/dist/nhsuk/components/skip-link/skip-link' { export default function SkipLink(): void; } -declare module 'nhse-tel-frontend/packages/components/details/details' { +declare module 'nhsuk-frontend/dist/nhsuk/components/details/details' { export default function Details(): void; } -declare module 'nhse-tel-frontend/packages/components/radios/radios' { +declare module 'nhsuk-frontend/dist/nhsuk/components/radios/radios' { export default function Radios(): void; } -declare module 'nhse-tel-frontend/packages/components/checkboxes/checkboxes' { +declare module 'nhsuk-frontend/dist/nhsuk/components/checkboxes/checkboxes' { export default function Checkboxes(): void; } -declare module 'nhse-tel-frontend/packages/components/card/card' { +declare module 'nhsuk-frontend/dist/nhsuk/components/card/card' { export default function Card(): void; } diff --git a/DigitalLearningSolutions.Web/Scripts/nhsuk.ts b/DigitalLearningSolutions.Web/Scripts/nhsuk.ts index 7ce2b613aa..68a0d3629d 100644 --- a/DigitalLearningSolutions.Web/Scripts/nhsuk.ts +++ b/DigitalLearningSolutions.Web/Scripts/nhsuk.ts @@ -1,23 +1,11 @@ // Components -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'; +import { initAll } from 'nhsuk-frontend'; // Polyfills -import 'nhse-tel-frontend/packages/polyfills'; import 'core-js/stable'; import 'regenerator-runtime/runtime'; // Initialize components -document.addEventListener( - 'DOMContentLoaded', - () => { - Details(); - Header(); - SkipLink(); - Radios(); - Checkboxes(); - }, -); +document.addEventListener('DOMContentLoaded', () => { + initAll(); +}); diff --git a/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts b/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts index a754f69348..d5fe9101f5 100644 --- a/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts +++ b/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts @@ -1,4 +1,3 @@ -import Details from 'nhse-tel-frontend/packages/components/details/details'; import _ from 'lodash'; import { setUpFilter, filterSearchableElements, IAppliedFilterTag, @@ -235,8 +234,6 @@ export class SearchSortFilterAndPaginate { searchableElements.forEach( (searchableElement) => searchableElementsContainer.appendChild(searchableElement.element), ); - // This is required to polyfill the new elements in IE - Details(); } updateResultCountAndPageNumber(count: number): void { diff --git a/DigitalLearningSolutions.Web/Scripts/spec/learningMenu/fullscreen.spec.ts b/DigitalLearningSolutions.Web/Scripts/spec/learningMenu/fullscreen.spec.ts index 3e9c6aba0c..17b78c67c6 100644 --- a/DigitalLearningSolutions.Web/Scripts/spec/learningMenu/fullscreen.spec.ts +++ b/DigitalLearningSolutions.Web/Scripts/spec/learningMenu/fullscreen.spec.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ import { JSDOM } from 'jsdom'; import { exitFullscreen, enterFullscreen } from '../../learningMenu/fullscreen'; - +/*qqqq what is this page do i need to update it*/ describe('enterFullscreen', () => { it('should show the exit fullscreen button', () => { // Given diff --git a/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts b/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts index 5510674c40..85318b6dea 100644 --- a/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts +++ b/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts @@ -1,5 +1,4 @@ import * as _ from 'lodash'; -import Details from 'nhse-tel-frontend/packages/components/details/details'; import { ISearchableData, ISearchableElement, @@ -112,8 +111,6 @@ function displaySearchableElements(searchableElements: ISearchableElement[]): vo searchableElementsContainer.selectedIndex = selectedElement ? searchableElements.indexOf(selectedElement) + 1 : 0; - // This is required to polyfill the new elements in IE - Details(); } function getCategoryAndTopicFilterStringAndUpdateHiddenInputs() { diff --git a/DigitalLearningSolutions.Web/Startup.cs b/DigitalLearningSolutions.Web/Startup.cs index 9b820a8045..53fca571a2 100644 --- a/DigitalLearningSolutions.Web/Startup.cs +++ b/DigitalLearningSolutions.Web/Startup.cs @@ -658,7 +658,7 @@ public void Configure(IApplicationBuilder app, IMigrationRunner migrationRunner, endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}") ); - migrationRunner.MigrateUp(); + migrationRunner.MigrateUp(); } private Task RedirectToLogin(RedirectContext context) diff --git a/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss b/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss index fb855d2611..7f10ffb208 100644 --- a/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss +++ b/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss @@ -1,15 +1,15 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; .nhsuk-card.comment { border-width: medium; } .nhsuk-card.comment.comment-mine { - border-color: $color_nhsuk-green; + border-color: nhsuk-colour("green"); } .nhsuk-card.comment.comment-other { - border-color: $color_nhsuk-blue; + border-color: nhsuk-colour("blue"); } .heading-xxs { @@ -18,7 +18,7 @@ .heading-light { font-weight: 200; - color: $color_nhsuk-grey-1; + color: nhsuk-colour("grey-1"); } .grid-column-ninety { diff --git a/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss b/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss index 9b9cac6d75..d8ab43f8d9 100644 --- a/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss +++ b/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "../shared/headingButtons" as *; @use "../shared/searchableElements/searchableElements" as *; $nhs-dark-grey: #425563; @@ -80,7 +80,7 @@ $nhs-dark-grey: #425563; button.nhsuk-pagination__link, a.nhsuk-pagination__link { border: none; background-color: transparent; - color: $nhsuk-link-color; + color: $nhsuk-link-colour; display: flex; // Since IE is bad at drawing boxes the correct size overflow: visible; @@ -96,11 +96,11 @@ button.nhsuk-pagination__link, a.nhsuk-pagination__link { } &:hover { - color: $nhsuk-link-hover-color; + color: $nhsuk-link-hover-colour; } &:active { - color: $nhsuk-link-active-color; + color: $nhsuk-link-active-colour; } } @@ -144,7 +144,7 @@ ol.hee-fwservice--framework-progress-bar { width: 150px; // hacky way to make the line the right size .hee-fwservice--framework-progress-marker { position: relative; - border: 2px solid $color_nhsuk-blue; + border: 2px solid nhsuk-colour("blue"); border-radius: 50%; width: 2rem; height: 2rem; @@ -154,7 +154,7 @@ ol.hee-fwservice--framework-progress-bar { .hee-fwservice--framework-progress-marker::before { content: ''; width: 120px; - border-top: 1px solid $color_nhsuk-blue; + border-top: 1px solid nhsuk-colour("blue"); position: absolute; top: 50%; left: 100%; @@ -171,8 +171,8 @@ ol.hee-fwservice--framework-progress-bar { .hee-fwservice--framework-progress-marker { font-weight: normal; - color: $color_nhsuk-white; - background-color: $color_nhsuk-blue; + color: nhsuk-colour("white"); + background-color: nhsuk-colour("blue"); } } } @@ -182,7 +182,7 @@ ul.no-decs { } .hee-fwservice--framework-structure { - background-color: $color_nhsuk-white; + background-color: nhsuk-colour("white"); display: block; padding: 24px; margin-bottom: 24px; diff --git a/DigitalLearningSolutions.Web/Styles/home/Policies.scss b/DigitalLearningSolutions.Web/Styles/home/Policies.scss index 77caf6c344..9716180bf8 100644 --- a/DigitalLearningSolutions.Web/Styles/home/Policies.scss +++ b/DigitalLearningSolutions.Web/Styles/home/Policies.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 87bdd1bdcc..d56ba4fa35 100644 --- a/DigitalLearningSolutions.Web/Styles/home/brands.scss +++ b/DigitalLearningSolutions.Web/Styles/home/brands.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "../shared/cardWithButtons"; @use "../shared/searchableElements/searchableElements"; @@ -12,7 +12,7 @@ .brands__top-horizontal-dash { @include mq($until: tablet) { - border-top: 1px solid $nhsuk-border-color; + border-top: 1px solid $nhsuk-border-colour; margin-top: nhsuk-spacing(3); } } @@ -24,8 +24,8 @@ } .header-row { - border-top: 1px solid $nhsuk-border-color; - border-bottom: 1px solid $nhsuk-border-color; + border-top: 1px solid $nhsuk-border-colour; + border-bottom: 1px solid $nhsuk-border-colour; margin-top: nhsuk-spacing(3); margin-bottom: nhsuk-spacing(3); display: flex; @@ -44,7 +44,7 @@ } .value-row { - border-bottom: 1px solid $nhsuk-border-color; + border-bottom: 1px solid $nhsuk-border-colour; margin-bottom: nhsuk-spacing(3); display: flex; diff --git a/DigitalLearningSolutions.Web/Styles/home/learningContent.scss b/DigitalLearningSolutions.Web/Styles/home/learningContent.scss index 5334a5f8dd..778aaebb3f 100644 --- a/DigitalLearningSolutions.Web/Styles/home/learningContent.scss +++ b/DigitalLearningSolutions.Web/Styles/home/learningContent.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; .learning-content-item { margin-bottom: 72px; @@ -47,7 +47,7 @@ .learning-content-item__image-box { box-shadow: 0 0 10px 1px rgba(0, 0, 0, 0.05); - background: $color_nhsuk-white; + background: nhsuk-colour("white"); border-radius: 4px; padding: 8px; height: fit-content; @@ -71,18 +71,18 @@ .see-more-link { &:visited { - color: $nhsuk-link-visited-color; + color: $nhsuk-link-visited-colour; } &:link { - color: $nhsuk-link-color; + color: $nhsuk-link-colour; } &:hover { - color: $nhsuk-link-hover-color; + color: $nhsuk-link-hover-colour; } &:active { - color: $nhsuk-link-active-color; + color: $nhsuk-link-active-colour; } } diff --git a/DigitalLearningSolutions.Web/Styles/home/products.scss b/DigitalLearningSolutions.Web/Styles/home/products.scss index f372734819..76a2915c32 100644 --- a/DigitalLearningSolutions.Web/Styles/home/products.scss +++ b/DigitalLearningSolutions.Web/Styles/home/products.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; .product { margin-bottom: 72px; diff --git a/DigitalLearningSolutions.Web/Styles/home/welcome.scss b/DigitalLearningSolutions.Web/Styles/home/welcome.scss index 51c14ac8c8..3b1f42b654 100644 --- a/DigitalLearningSolutions.Web/Styles/home/welcome.scss +++ b/DigitalLearningSolutions.Web/Styles/home/welcome.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; .welcome-page-button-container { margin-bottom: 32px; @@ -26,9 +26,9 @@ } .auth-button--blue { - background-color: $color_nhsuk-blue; + background-color: nhsuk-colour("blue"); } .auth-button--blue:hover { - background-color: darken($color_nhsuk-blue, 5%); + background-color: darken(nhsuk-colour("blue"), 5%); } diff --git a/DigitalLearningSolutions.Web/Styles/index.scss b/DigitalLearningSolutions.Web/Styles/index.scss index c61029a83f..60b6cdcfd9 100644 --- a/DigitalLearningSolutions.Web/Styles/index.scss +++ b/DigitalLearningSolutions.Web/Styles/index.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; $iframe-padding-bottom: nhsuk-spacing(8) * 2; @@ -26,7 +26,7 @@ ul > li > ul > li { } .delete-button { - background-color: $nhsuk-error-color; + background-color: $nhsuk-error-colour; box-shadow: 0 4px 0 #6b140e; margin-bottom: 16px !important; } @@ -65,7 +65,7 @@ ul > li > ul > li { input:invalid { - border: $nhsuk-border-width-form-element-error solid $nhsuk-error-color; + border: $nhsuk-border-width-form-element-error solid $nhsuk-error-colour; } input[type=file] { @@ -190,7 +190,7 @@ ul.no-bullets { } .divider { - border-bottom: 1px solid $nhsuk-border-color; + border-bottom: 1px solid $nhsuk-border-colour; margin-bottom: nhsuk-spacing(3); } @@ -219,13 +219,13 @@ ul.no-bullets { .side-nav__heading { @extend .nhsuk-u-font-weight-bold; - color: $color_nhsuk-grey-1; + color: nhsuk-colour("grey-1"); @include nhsuk-responsive-margin(3, "bottom"); @include nhsuk-responsive-padding(1, "top"); @extend .nhsuk-u-font-size-19; @include govuk-media-query($until: desktop) { - color: $nhsuk-text-color; + color: $nhsuk-text-colour; } } @@ -233,11 +233,11 @@ ul.no-bullets { text-decoration: none; &:visited { - color: $nhsuk-link-color; + color: $nhsuk-link-colour; } &:hover { - color: $nhsuk-link-hover-color; + color: $nhsuk-link-hover-colour; text-decoration: underline; } } @@ -253,7 +253,7 @@ ul.no-bullets { } .side-nav__item--selected { - border-left: 4px solid $nhsuk-link-color; + border-left: 4px solid $nhsuk-link-colour; @include nhsuk-responsive-padding(2, "left"); @extend .nhsuk-u-font-weight-bold; @@ -266,7 +266,7 @@ ul.no-bullets { ul { display: table; list-style-type: none; - border-bottom: 1px solid $color_nhsuk-grey-1; + border-bottom: 1px solid nhsuk-colour("grey-1"); table-layout: fixed; width: 100%; text-align: center; @@ -283,7 +283,7 @@ ul.no-bullets { } &.active { - border-bottom: 3px solid $color_nhsuk-blue; + border-bottom: 3px solid nhsuk-colour("blue"); font-weight: bold; background-color: white; } @@ -302,12 +302,12 @@ ul.no-bullets { .button-as-link { background: none; border: none; - color: $nhsuk-link-color; + color: $nhsuk-link-colour; @extend .nhsuk-u-font-size-19; text-decoration: underline; &:hover { - color: $nhsuk-link-hover-color; + color: $nhsuk-link-hover-colour; text-decoration: none; cursor: pointer; } diff --git a/DigitalLearningSolutions.Web/Styles/layout.scss b/DigitalLearningSolutions.Web/Styles/layout.scss index 62fe159b39..428097e4f7 100644 --- a/DigitalLearningSolutions.Web/Styles/layout.scss +++ b/DigitalLearningSolutions.Web/Styles/layout.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "shared/breakpoints" as *; html { @@ -247,7 +247,7 @@ footer { text-transform: uppercase; &.header-beta--dark { - color: $color_nhsuk-dark-pink; + color: nhsuk-colour("dark-pink"); } } @@ -261,7 +261,7 @@ footer { } .dls-alert-banner { - background-color: $color_nhsuk-dark-pink; + background-color: nhsuk-colour("dark-pink"); padding-bottom: 0.1px; color: #FFFFFF; @@ -280,8 +280,8 @@ footer { .feedback-tag { align-items: center; - background-color: $color_nhsuk-blue; - color: $color_nhsuk-white; + background-color: nhsuk-colour("blue"); + color: nhsuk-colour("white"); display: inline-flex; font-family: "Frutiger W01", Arial, sans-serif; font-size: 19px; @@ -302,8 +302,8 @@ footer { } .feedback-bar { - background-color: $color_nhsuk-grey-5; - border-bottom: 1px solid $color_nhsuk-grey-4; + background-color: nhsuk-colour("grey-5"); + border-bottom: 1px solid nhsuk-colour("grey-4"); } .validation-summary-valid { diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss index ef089148f7..d9acf4dfb8 100644 --- a/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss +++ b/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss @@ -1,5 +1,5 @@ -@use "nhse-tel-frontend/packages/core/all" as *; -@import "nhse-tel-frontend/packages/components/tag/_tag"; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; +@import "nhsuk-frontend/dist/nhsuk/components/tag/_tag"; .learning-menu-card { border: none; @@ -14,7 +14,7 @@ .status-tag { @extend .nhsuk-tag; - @extend .nhsuk-u-font-size-24; + @extend .nhsuk-u-font-size-26; @extend .nhsuk-u-margin-bottom-3; &.incomplete { @@ -63,9 +63,9 @@ hr.thick { } .passed-text { - color: $color_nhsuk-green; + color: nhsuk-colour("green"); } .not-passed-text { - @extend .nhsuk-u-secondary-text-color; + @extend .nhsuk-u-secondary-text-colour; } diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss index 415d8c11fb..70e33ec656 100644 --- a/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss +++ b/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 7fe9a1f15f..ec422b7246 100644 --- a/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss +++ b/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss @@ -1,7 +1,7 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; .objectives-card { - @include nhsuk-typography-responsive(19); + @include nhsuk-font-size(19); } .tutorial-video { diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss index 6bdede8d2c..1a9335419a 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss @@ -4,10 +4,10 @@ // Author: Darlan Rod https://github.com/darlanrod // Version 1.5.2 // MIT License -@use "nhse-tel-frontend/packages/core/settings/colours" as *; +@use "nhsuk-frontend/dist/nhsuk/core/settings/" as *; -$track-color: $color_nhsuk-grey-3 !default; -$thumb-color: $color_nhsuk-grey-2 !default; +$track-color: nhsuk-colour("grey-3") !default; +$thumb-color: nhsuk-colour("grey-2") !default; $thumb-radius: 2px !default; $thumb-height: 24px !default; @@ -18,7 +18,7 @@ $thumb-border-color: #eceff1 !default; $track-width: 100% !default; $track-height: 24px !default; $track-border-width: 2px !default; -$track-border-color: $color_nhsuk-grey-3 !default; +$track-border-color: nhsuk-colour("grey-3") !default; $focus-track-border-width: 4px !default; $track-radius: 5px !default; @@ -55,8 +55,8 @@ $track-radius: 5px !default; } &:focus { - border: $focus-track-border-width solid $color_nhsuk-black; - box-shadow: 0 0 0 4px $nhsuk-focus-color; + border: $focus-track-border-width solid nhsuk-colour("black"); + box-shadow: 0 0 0 4px $nhsuk-focus-colour; &::-webkit-slider-runnable-track { border: none; @@ -68,7 +68,7 @@ $track-radius: 5px !default; } &::-moz-range-progress { - background-color: $color_nhsuk-blue; + background-color: nhsuk-colour("blue"); height: $track-height - ( 2 * $focus-track-border-width); border-radius: 3px; } @@ -128,7 +128,7 @@ $track-radius: 5px !default; border: $track-border-width solid $track-border-color; border-radius: $track-radius; box-sizing: content-box; - background: $color_nhsuk-blue; + background: nhsuk-colour("blue"); } &::-ms-fill-upper { @@ -139,7 +139,7 @@ $track-radius: 5px !default; } &::-moz-range-progress { - background-color: $color_nhsuk-blue; + background-color: nhsuk-colour("blue"); height: $track-height - ( 2 * $track-border-width); border-radius: 3px; } @@ -148,7 +148,7 @@ $track-radius: 5px !default; overflow-x: hidden; &::-webkit-slider-thumb { - box-shadow: -800px 0 0 800px $color_nhsuk-blue; + box-shadow: -800px 0 0 800px nhsuk-colour("blue"); } .js-enabled & { diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss index 0752002412..8a81c96d76 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 517a0ad04d..e8d5bfdbb0 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss @@ -1,38 +1,38 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "courses"; .searchable-element { &.overdue { background-color: #fff; - border-left: 6px solid $color_nhsuk-red; + border-left: 6px solid nhsuk-colour("red"); } &.due-soon { background-color: #fff; - border-left: 6px solid $color_nhsuk-yellow; + border-left: 6px solid nhsuk-colour("yellow"); } } a.delete-button { - background-color: $color_nhsuk-red; - box-shadow: 0 4px 0 shade($color_nhsuk-red, 50%); + background-color: nhsuk-colour("red"); + box-shadow: 0 4px 0 nhsuk-shade(nhsuk-colour("red"), 50%); margin-bottom: 16px !important; &:hover { - background-color: shade($color_nhsuk-red, 20%); + background-color: nhsuk-shade(nhsuk-colour("red"), 20%); } &:active { - background-color: shade($color_nhsuk-red, 50%); + background-color: nhsuk-shade(nhsuk-colour("red"), 50%); } } .overdue { - background-color: tint($color_nhsuk-red, 80); + background-color: nhsuk-tint(nhsuk-colour("red"), 80); } .due-soon { - background-color: $color_nhsuk-yellow; + background-color: nhsuk-colour("yellow"); } h3.course-title { diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss index 053c1834c6..1bbf2b4594 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss @@ -1,5 +1,5 @@ @use "inputrange" as *; -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "courses" as *; @use "../shared/breakpoints" as *; @use "../shared/searchableElements/searchableElements" as *; @@ -56,7 +56,7 @@ details.nhsuk-details { .score { margin-left: 48px; - color: $color_nhsuk-black; + color: nhsuk-colour("black"); font-size: 1.25rem; font-weight: 600; display: inline-block; @@ -97,7 +97,7 @@ details.nhsuk-details { padding-right: 32px; margin-top: 20px; margin-bottom: 20px; - background-color: $color_nhsuk-grey-5; + background-color: nhsuk-colour("grey-5"); box-sizing: border-box; } @@ -155,7 +155,7 @@ details.nhsuk-details { .asset-title-header .title { font-size: 1.6rem; font-weight: bold; - color: $nhsuk-secondary-text-color; + color: $nhsuk-secondary-text-colour; padding: 1rem 0 0 0; display: inline-block; } @@ -186,19 +186,19 @@ details.nhsuk-details { } .tag.tag-article { - background-color: $nhsuk-link-active-color; + background-color: $nhsuk-link-active-colour; } .tag.tag-online.course { - background-color: $nhsuk-link-color; + background-color: $nhsuk-link-colour; } .tag.tag-learning.guide { - background-color: $nhsuk-link-hover-color; + background-color: $nhsuk-link-hover-colour; } .tag.tag-video { - background-color: $nhsuk-link-visited-color; + background-color: $nhsuk-link-visited-colour; } @media only screen and (max-width: $mq-tablet) { diff --git a/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss b/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss index c13339e4a9..08686c8089 100644 --- a/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss +++ b/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 4d3b2a5381..b17d1e3cc4 100644 --- a/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss +++ b/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; .top-spaced-goback { margin-top: 32px; @@ -9,7 +9,7 @@ } .preference-row { - border-bottom: 1px solid $color_nhsuk-grey-4; + border-bottom: 1px solid nhsuk-colour("grey-4"); margin-top: 24px; } diff --git a/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss b/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss index ab6bd89c42..3700fb072c 100644 --- a/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss +++ b/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; .update-notification-hint { margin-bottom: 24px; diff --git a/DigitalLearningSolutions.Web/Styles/nhsuk.scss b/DigitalLearningSolutions.Web/Styles/nhsuk.scss index 51b728e407..59737d475a 100644 --- a/DigitalLearningSolutions.Web/Styles/nhsuk.scss +++ b/DigitalLearningSolutions.Web/Styles/nhsuk.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/nhsuk" as *; +@use "nhsuk-frontend/dist/nhsuk/nhsuk" as *; .nhsuk-u-margin-right-auto { margin-right: auto; @@ -70,9 +70,10 @@ body:not(.js-enabled) { margin-bottom: 0; } -nav, .nhsuk-header__navigation, #header-navigation { +/*Breaks mobile "more" expansion */ +/*nav, .nhsuk-header__navigation, #header-navigation { border-bottom: 0; -} +}*/ .nhsuk-heading-xl.heading-margin-2 { margin-bottom: nhsuk-spacing(2); @@ -85,16 +86,16 @@ nav, .nhsuk-header__navigation, #header-navigation { } .nhsuk-button--danger { - background-color: $color_nhsuk-red; - box-shadow: 0 4px 0 shade($color_nhsuk-red, 50%); + background-color: nhsuk-colour("red"); + box-shadow: 0 4px 0 shade(nhsuk-colour("red"), 50%); margin-bottom: 16px !important; &:hover { - background-color: shade($color_nhsuk-red, 20%); + background-color: shade(nhsuk-colour("red"), 20%); } &:active { - background-color: shade($color_nhsuk-red, 50%); + background-color: shade(nhsuk-colour("red"), 50%); } } diff --git a/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss b/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss index ef2745ce14..55e08440af 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss @@ -1,11 +1,11 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; .card-with-buttons { background-color: #fff; @extend .nhsuk-u-margin-top-3; @extend .nhsuk-u-margin-bottom-4; padding-bottom: 16px; - border: 1px solid $nhsuk-border-color; + border: 1px solid $nhsuk-border-colour; border-bottom-width: 4px; } diff --git a/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss b/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss index 255c6594fd..d185525d3a 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 450c89de63..3dab0b2272 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 4efbdc04c3..bea7216ba9 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/reports.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/reports.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "chartist/dist/scss/chartist"; $dark-blue: #005EB8; @@ -78,8 +78,8 @@ $light-blue: #8EBAFF; } .ct-label { - color: $nhsuk-secondary-text-color; - fill: $nhsuk-secondary-text-color; + color: $nhsuk-secondary-text-colour; + fill: $nhsuk-secondary-text-colour; } .ct-label.ct-label.ct-horizontal { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss index b19b0a1714..3166891467 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "../breakpoints"; $nhs-dark-grey: #425563; @@ -33,7 +33,7 @@ $button-active-colour: #002f5c; } .input-with-submit-button { - border: 2px solid $nhsuk-form-border-color; + border: 2px solid $nhsuk-form-border-colour; border-right: 0; border-radius: 4px 0 0 4px; height: 52px; @@ -59,7 +59,7 @@ $button-active-colour: #002f5c; .pagination-input-with-no-js-submit-button-border { .js-enabled & { - border-right: 2px solid $nhsuk-form-border-color; + border-right: 2px solid $nhsuk-form-border-colour; border-radius: 4px; &:focus { @@ -81,7 +81,7 @@ $button-active-colour: #002f5c; } .left-dropdown { - border: 2px solid $nhsuk-form-border-color; + border: 2px solid $nhsuk-form-border-colour; border-radius: 4px; height: 52px; padding: 0 9px; diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss index 172711ce20..2eeab56cc6 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use '../../shared/searchableElements/common' as *; .filter-container { @@ -102,7 +102,7 @@ @extend .inline-button; width: 20%; border-radius: 4px; - background-color: $color_nhsuk-red; + background-color: nhsuk-colour("red"); @include mq($until: tablet) { margin-top: nhsuk-spacing(2); diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss index 81759368ca..8b8ece9780 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 8f16fb41bf..8684435955 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "common" as *; .pagination-hidden { @@ -37,14 +37,14 @@ } .page-indicator { - @include nhsuk-typography-responsive(24); + @include nhsuk-font-size(26); padding-top: 1px; } button.nhsuk-pagination__link { border: none; background-color: transparent; - color: $nhsuk-link-color; + color: $nhsuk-link-colour; display: flex; width: auto; // Since IE is bad at drawing boxes the correct size @@ -65,11 +65,11 @@ button.nhsuk-pagination__link { } &:hover { - color: $nhsuk-link-hover-color; + color: $nhsuk-link-hover-colour; } &:active { - color: $nhsuk-link-active-color; + color: $nhsuk-link-active-colour; } } diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss index c2f9e07982..853a638d41 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "common" as *; .search-box-container { @@ -25,11 +25,11 @@ .nhsuk-icon__search { height: 27px; width: 27px; - fill: $color_nhsuk-white; + fill: nhsuk-colour("white"); } &:focus:not(:active) .nhsuk-icon__search { - fill: $nhsuk-focus-text-color; + fill: $nhsuk-focus-text-colour; } #js-styling-hidden-area-while-loading & { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss index 54f2998317..a00e72b492 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 1a8f147f28..59ac06ec7f 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "common" as *; .tags { @@ -17,19 +17,19 @@ } .tag.tag-article { - background-color: $nhsuk-link-active-color; + background-color: $nhsuk-link-active-colour; } .tag.tag-online.course { - background-color: $nhsuk-link-color; + background-color: $nhsuk-link-colour; } .tag.tag-learning.guide { - background-color: $nhsuk-link-hover-color; + background-color: $nhsuk-link-hover-colour; } .tag.tag-video { - background-color: $nhsuk-link-visited-color; + background-color: $nhsuk-link-visited-colour; } .card-tag { diff --git a/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss b/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss index 6e26b6c05d..c4839b83b9 100644 --- a/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss +++ b/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 ae4735b585..76060a9f43 100644 --- a/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss +++ b/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 4193d0c53b..1386e3396d 100644 --- a/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss +++ b/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 61d2e738c7..9716504a30 100644 --- a/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss +++ b/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 5f2a05026c..9ac5a1d7f8 100644 --- a/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss +++ b/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss @@ -1,6 +1,6 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; .loggedinuser .card-background { - color: $nhsuk-text-color; + color: $nhsuk-text-colour; } diff --git a/DigitalLearningSolutions.Web/Styles/support/support.scss b/DigitalLearningSolutions.Web/Styles/support/support.scss index 4b96c6f5a9..bd2040c182 100644 --- a/DigitalLearningSolutions.Web/Styles/support/support.scss +++ b/DigitalLearningSolutions.Web/Styles/support/support.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 ae5a4c5005..aa011a3d62 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 e9c4889712..8422726840 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 976182b861..f4348dc4fc 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 ea1e5481d0..651380b2d0 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss @@ -1,7 +1,7 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "../shared/searchableElements/searchableElements"; -$current-centre-highlight: $color_nhsuk-pale-yellow; +$current-centre-highlight: nhsuk-colour("pale-yellow"); .current-centre { background-color: $current-centre-highlight; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss index 0e76a46820..5da1f9d73d 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss @@ -1,14 +1,14 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; // The colours here are tied to the colour conversion from percentages // defined in DisplayColourHelper .coloured-card-number { &--blue { - color: $color_nhsuk-blue; + color: nhsuk-colour("blue"); } &--green { - color: $color_nhsuk-green; + color: nhsuk-colour("green"); } &--yellow { @@ -16,10 +16,10 @@ } &--red { - color: $color_nhsuk-red; + color: nhsuk-colour("red"); } &--grey { - color: $color_nhsuk-grey-1; + color: nhsuk-colour("grey-1"); } } diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss index fd09a260a6..ad4dd7cf62 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 286d0df9a1..02bf8bc33c 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss @@ -1,5 +1,5 @@ @use "../shared/cardWithButtons"; -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "../shared/searchableElements/searchableElements"; @use "../shared/headingButtons.scss"; @@ -8,9 +8,9 @@ } .status-inactive { - border-left: 6px solid tint($color_nhsuk-red, 80); + border-left: 6px solid nhsuk-tint(nhsuk-colour("red"), 80); } .status-archived { - border-left: 6px solid $color_nhsuk-grey-2; + border-left: 6px solid nhsuk-colour("grey-2"); } diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss index 47fb8f20d5..651fb30fcd 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss @@ -1,4 +1,4 @@ -@use 'nhse-tel-frontend/packages/core/all' as *; +@use 'nhsuk-frontend/dist/nhsuk/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 cdf0f48f02..6fe5669481 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss @@ -1,2 +1,2 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "../../shared/searchableElements/searchableElements"; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss index 5e6484507f..18bca2d888 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 ccab1d9964..a17f04b2a8 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/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 cc0aaa6381..b6407a066f 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; @use "../shared/searchableElements/searchableElements"; .view-delegate-top-button-group { @@ -43,29 +43,29 @@ .nhsuk-expander-group { &.completed { background-color: #fff; - border-left: 6px solid $color_nhsuk-green; + border-left: 6px solid nhsuk-colour("green"); } &.removed { background-color: #fff; - border-left: 6px solid $color_nhsuk-red; + border-left: 6px solid nhsuk-colour("red"); } &.inactive { background-color: #fff; - border-left: 6px solid tint($color_nhsuk-red, 80); + border-left: 6px solid nhsuk-tint(nhsuk-colour("red"), 80); } &.archived { background-color: #fff; - border-left: 6px solid $color_nhsuk-grey-2; + border-left: 6px solid nhsuk-colour("grey-2"); } } .status-inactive { - border-left: 6px solid tint($color_nhsuk-red, 80); + border-left: 6px solid nhsuk-tint(nhsuk-colour("red"), 80); } .status-archived { - border-left: 6px solid $color_nhsuk-grey-2; + border-left: 6px solid nhsuk-colour("grey-2"); } diff --git a/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss b/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss index b297b18151..5b2422184b 100644 --- a/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss +++ b/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/nhsuk/core/all" as *; .feedback-chevron { padding: 0 !important; @@ -7,7 +7,7 @@ } .feedback-chevron svg { - fill: $color_nhsuk-white !important; + fill: nhsuk-colour("white") !important; height: 24px !important; width: 24px !important; } diff --git a/DigitalLearningSolutions.Web/Views/ApplicationSelector/Index.cshtml b/DigitalLearningSolutions.Web/Views/ApplicationSelector/Index.cshtml index 1b4bb670fb..066ac824ef 100644 --- a/DigitalLearningSolutions.Web/Views/ApplicationSelector/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/ApplicationSelector/Index.cshtml @@ -22,13 +22,8 @@ Learning Portal

Access to your current, available and completed learning courses.

- -

Manage and distribute learning to your organisation and access reports.

- -

Import and manage learning content that's delivered through the Digital Learning Solutions platform.

-

Assign and review staff profile assessments and arrange supervision sessions.

-

Create interactive elearning and assessments.

-

Create and distribute competency frameworks and role profiles.

-

Manage content and settings across the whole system.

-
    -
  1. Competency Assessments
    2. -
  2. Manage Competency Assessment
    3. -
  3. Select framework sources
    4. -
-

Back to manage competency assessment

+
  • Competency Assessments
    • +
  • Manage Competency Assessment
    • +
  • Select framework sources
    • + + Back to manage competency assessment
    } @@ -50,7 +50,7 @@ } -
    +
    @foreach (var competency in competencyGroup.FrameworkCompetencies) {
    diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml index 1bb44950b3..85a10b3a41 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml @@ -13,11 +13,11 @@ } @@ -35,7 +35,7 @@ Select the framework source you would like to use to add @Model.VocabularyPlural.ToLower() to this competency assessment. -
    +
    @foreach (var framework in Model.LinkedFrameworks) {
    diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentFeatures.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentFeatures.cshtml index 1e5ef6a629..a7ea87a4a4 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentFeatures.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentFeatures.cshtml @@ -13,9 +13,9 @@ @@ -53,7 +53,7 @@ -
    +
      -
    1. Competency Assessments
      2. -
    2. Competency Assessment Features
      3. -
    3. Competency assessment features summary
      4. +
    4. Competency Assessments
      5. +
    5. Competency Assessment Features
      6. +
    6. Competency assessment features summary
    diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmRemoveFrameworkSource.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmRemoveFrameworkSource.cshtml index a20a786820..02132c8691 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmRemoveFrameworkSource.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmRemoveFrameworkSource.cshtml @@ -1,51 +1,51 @@ -@using DigitalLearningSolutions.Web.Helpers -@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments -@model ConfirmRemoveFrameworkSourceViewModel; -@{ - var errorHasOccurred = !ViewData.ModelState.IsValid; - ViewData["Title"] = "Competency Assessments - Remove source framework"; -} -
    -
    - @if (errorHasOccurred) - { - - } - -

    Remove framework source from @Model.AssessmentName

    -
    -
    - - - -
    -
    -
    - - - - - - -

    - This competency assessment has @Model.CompetencyCount @DisplayStringHelper.PluraliseStringIfRequired(@Model.Vocabulary.ToLower(), Model.CompetencyCount) - associated with it from the framework @Model.FrameworkName. Removing this - framework source will remove the @DisplayStringHelper.PluraliseStringIfRequired(@Model.Vocabulary.ToLower(), Model.CompetencyCount) from the assessment. -

    - - - - - -
    - - - Cancel - -
    -
    -
    +@using DigitalLearningSolutions.Web.Helpers +@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +@model ConfirmRemoveFrameworkSourceViewModel; +@{ + var errorHasOccurred = !ViewData.ModelState.IsValid; + ViewData["Title"] = "Competency Assessments - Remove source framework"; +} +
    +
    + @if (errorHasOccurred) + { + + } + +

    Remove framework source from @Model.AssessmentName

    +
    +
    + + + +
    +
    +
    + + + + + + +

    + This competency assessment has @Model.CompetencyCount @DisplayStringHelper.PluraliseStringIfRequired(@Model.Vocabulary.ToLower(), Model.CompetencyCount) + associated with it from the framework @Model.FrameworkName. Removing this + framework source will remove the @DisplayStringHelper.PluraliseStringIfRequired(@Model.Vocabulary.ToLower(), Model.CompetencyCount) from the assessment. +

    + + + + + +
    + + + Cancel + +
    +
    +
    diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml index f69c53f94e..79963525e7 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml @@ -13,11 +13,11 @@ } @@ -69,7 +69,7 @@ Save -
    +
      -
    1. Competency Assessments
      2. -
    2. Manage Competency Assessment
      3. -
    3. Introductory text
      4. +
    4. Competency Assessments
      5. +
    5. Manage Competency Assessment
      6. +
    6. Introductory text
    -

    Back to competency assessment detail

    + Back to competency assessment detail
    } @@ -48,7 +48,7 @@ -
    +
      -
    1. Competency Assessments
      2. -
    2. Manage Competency Assessment
      3. -
    3. Introductory text
      4. +
    4. Competency Assessments
      5. +
    5. Manage Competency Assessment
      6. +
    6. Introductory text
    -

    Back to competency assessment detail

    + Back to competency assessment detail
    } @@ -249,7 +249,7 @@ else if (Model.ActionName == "Summary") } -
    +
      -
    1. Competency Assessments
      2. -
    2. Manage Competency Assessment
      3. -
    3. Brand and category
      4. +
    4. Competency Assessments
      5. +
    5. Manage Competency Assessment
      6. +
    6. Brand and category
    -

    Back to competency assessment detail

    + Back to competency assessment detail
    } @@ -35,7 +35,7 @@ Choose assessment vocabulary - the name given to the building blocks of your assessment. -
    +