Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions DigitalLearningSolutions.Web/Scripts/index.d.ts
Original file line number Diff line number Diff line change
@@ -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;
}
12 changes: 6 additions & 6 deletions DigitalLearningSolutions.Web/Scripts/nhsuk.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Styles/home/Policies.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Styles/home/brands.scss
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Styles/home/products.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "nhsuk-frontend/packages/core/all" as *;
@use "nhse-tel-frontend/packages/core/all" as *;

.product {
margin-bottom: 72px;
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Styles/home/welcome.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Styles/index.scss
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Styles/layout.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "nhsuk-frontend/packages/core/all" as *;
@use "nhse-tel-frontend/packages/core/all" as *;
@use "shared/breakpoints" as *;

html {
Expand Down
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Web/Styles/learningMenu/index.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "nhsuk-frontend/packages/core/all" as *;
@use "nhse-tel-frontend/packages/core/all" as *;
@use "courses";

.searchable-element {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 *;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "nhsuk-frontend/packages/core/all" as *;
@use "nhse-tel-frontend/packages/core/all" as *;

.centre-role-tags {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Styles/nhsuk.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Styles/shared/reports.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "nhsuk-frontend/packages/core/all" as *;
@use "nhse-tel-frontend/packages/core/all" as *;
@use "common" as *;

.pagination-hidden {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "nhsuk-frontend/packages/core/all" as *;
@use "nhse-tel-frontend/packages/core/all" as *;
@use "common" as *;

.tags {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 *;

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Styles/superAdmin/users.scss
Original file line number Diff line number Diff line change
@@ -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 *;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Styles/support/support.scss
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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 *;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
Original file line number Diff line number Diff line change
@@ -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 *;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@use "nhsuk-frontend/packages/core/all" as *;
@use "nhse-tel-frontend/packages/core/all" as *;
@use "../../shared/searchableElements/searchableElements";
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "nhsuk-frontend/packages/core/all" as *;
@use "nhse-tel-frontend/packages/core/all" as *;

.feedback-chevron {
padding: 0 !important;
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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\\.[^\\/]+$',
],

Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
8 changes: 4 additions & 4 deletions DigitalLearningSolutions.Web/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading