diff --git a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj index d93a524c4d..dcbccf6154 100644 --- a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj +++ b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj @@ -88,6 +88,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -151,6 +369,24 @@ <_ContentIncludedByDefault Remove="Views\Shared\Components\VerifyEmailWarningIfAppropriate\Default.cshtml" /> + + + + + + + + + + + + + + + + + + diff --git a/DigitalLearningSolutions.Web/Scripts/nhsuk.ts b/DigitalLearningSolutions.Web/Scripts/nhsuk.ts index 9a0e4bb5cd..5114afd99e 100644 --- a/DigitalLearningSolutions.Web/Scripts/nhsuk.ts +++ b/DigitalLearningSolutions.Web/Scripts/nhsuk.ts @@ -4,7 +4,6 @@ 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 Card from 'nhsuk-frontend/packages/components/card/card'; // Polyfills import 'nhsuk-frontend/packages/polyfills'; @@ -20,6 +19,5 @@ document.addEventListener( SkipLink(); Radios(); Checkboxes(); - Card(); }, ); diff --git a/DigitalLearningSolutions.Web/Styles/layout.scss b/DigitalLearningSolutions.Web/Styles/layout.scss index c0ef2ada6a..3f5481951e 100644 --- a/DigitalLearningSolutions.Web/Styles/layout.scss +++ b/DigitalLearningSolutions.Web/Styles/layout.scss @@ -329,7 +329,7 @@ nav, .nhsuk-header__navigation, #header-navigation { } } -.nhsuk-width-container { +.nhsuk-width-container, .nhsuk-header__navigation-list { max-width: 1144px !important; padding-left: $nhsuk-gutter !important; padding-right: $nhsuk-gutter !important; diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml index 770be2e6fb..b2f8dff16a 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml @@ -5,32 +5,27 @@
  • Dashboard -
  • Frameworks -
  • Role Profiles -
  • Support -
  • My account -
  • diff --git a/DigitalLearningSolutions.Web/Views/LearningMenu/Shared/_NavMenuItems.cshtml b/DigitalLearningSolutions.Web/Views/LearningMenu/Shared/_NavMenuItems.cshtml index 2ea72c7d40..dd019227a7 100644 --- a/DigitalLearningSolutions.Web/Views/LearningMenu/Shared/_NavMenuItems.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningMenu/Shared/_NavMenuItems.cshtml @@ -2,12 +2,10 @@
  • Learning portal -
  • My account -
  • diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml index a92ae4ce53..a9de23705f 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml @@ -95,6 +95,7 @@ + > @await RenderSectionAsync("scripts", false) diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_NavMenuItems.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_NavMenuItems.cshtml index 90242f331c..6502b36796 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_NavMenuItems.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_NavMenuItems.cshtml @@ -3,24 +3,20 @@
  • Current activities -
  • Completed activities -
  • Available activities -
  • My account -
  • diff --git a/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml index 556ae2192c..e6247132a5 100644 --- a/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml +++ b/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml @@ -1,28 +1,38 @@ -