Skip to content

Commit 3b5ee9b

Browse files
kevwhitt-heekevwhitt-hee
authored
Merge pull request #3100 from TechnologyEnhancedLearning/Develop/Fixes/TD-5327-UpdateNHSDesignSystem
TD-5327 update nhs design system
2 parents cb9133d + 3ae33b6 commit 3b5ee9b

File tree

16 files changed

+2249
-21455
lines changed

16 files changed

+2249
-21455
lines changed

‎DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj‎

Lines changed: 236 additions & 0 deletions
Large diffs are not rendered by default.

‎DigitalLearningSolutions.Web/Scripts/nhsuk.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import SkipLink from 'nhsuk-frontend/packages/components/skip-link/skip-link';
44
import Details from 'nhsuk-frontend/packages/components/details/details';
55
import Radios from 'nhsuk-frontend/packages/components/radios/radios';
66
import Checkboxes from 'nhsuk-frontend/packages/components/checkboxes/checkboxes';
7-
import Card from 'nhsuk-frontend/packages/components/card/card';
87

98
// Polyfills
109
import 'nhsuk-frontend/packages/polyfills';
@@ -20,6 +19,5 @@ document.addEventListener(
2019
SkipLink();
2120
Radios();
2221
Checkboxes();
23-
Card();
2422
},
2523
);

‎DigitalLearningSolutions.Web/Styles/layout.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ nav, .nhsuk-header__navigation, #header-navigation {
329329
}
330330
}
331331

332-
.nhsuk-width-container {
332+
.nhsuk-width-container, .nhsuk-header__navigation-list {
333333
max-width: 1144px !important;
334334
padding-left: $nhsuk-gutter !important;
335335
padding-right: $nhsuk-gutter !important;

‎DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,27 @@
55
<li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.Dashboard)">
66
<a class="nhsuk-header__navigation-link" asp-controller="Frameworks" asp-action="Index">
77
Dashboard
8-
<partial name="_NhsChevronRight" />
98
</a>
109
</li>
1110
<li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.Frameworks)">
1211
<a class="nhsuk-header__navigation-link" asp-controller="Frameworks" asp-action="ViewFrameworks" asp-route-tabname="Mine">
1312
Frameworks
14-
<partial name="_NhsChevronRight" />
1513
</a>
1614
</li>
1715
<feature name="@(FeatureFlags.WorkforceManagerInterface)">
1816
<li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.RolesProfiles)">
1917
<a class="nhsuk-header__navigation-link" asp-controller="RoleProfiles" asp-action="ViewRoleProfiles" asp-route-tabname="Mine">
2018
Role Profiles
21-
<partial name="_NhsChevronRight" />
2219
</a>
2320
</li>
2421
</feature>
2522
<li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.Support)">
2623
<a class="nhsuk-header__navigation-link" asp-controller="Support" asp-action="Index" asp-route-dlsSubApplication="@DlsSubApplication.Frameworks.UrlSegment">
2724
Support
28-
<partial name="_NhsChevronRight" />
2925
</a>
3026
</li>
3127
<li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.MyAccount)">
3228
<a class="nhsuk-header__navigation-link" asp-controller="MyAccount" asp-action="Index" asp-route-dlsSubApplication="@DlsSubApplication.Frameworks.UrlSegment">
3329
My account
34-
<partial name="_NhsChevronRight" />
3530
</a>
3631
</li>

‎DigitalLearningSolutions.Web/Views/LearningMenu/Shared/_NavMenuItems.cshtml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
<li class="nhsuk-header__navigation-item">
33
<a class="nhsuk-header__navigation-link" asp-controller="LearningMenu" asp-action="Close">
44
Learning portal
5-
<partial name="_NhsChevronRight" />
65
</a>
76
</li>
87
<li class="nhsuk-header__navigation-item">
98
<a class="nhsuk-header__navigation-link" asp-controller="MyAccount" asp-action="Index" asp-route-dlsSubApplication="@DlsSubApplication.LearningPortal.UrlSegment">
109
My account
11-
<partial name="_NhsChevronRight" />
1210
</a>
1311
</li>

‎DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<partial name="/Views/LearningPortal/Shared/_LoadingSpinner.cshtml" />
9696
</div>
9797
<partial name="_DlsFooter" />
98+
<script src="@Url.Content("~/js/nhsuk.js")" asp-append-version="true"></script>>
9899
@await RenderSectionAsync("scripts", false)
99100
</div>
100101
</body>

‎DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_NavMenuItems.cshtml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,20 @@
33
<li class="nhsuk-header__navigation-item @Html.IsSelected("Current")">
44
<a class="nhsuk-header__navigation-link" asp-controller="LearningPortal" asp-action="Current">
55
Current activities
6-
<partial name="_NhsChevronRight" />
76
</a>
87
</li>
98
<li class="nhsuk-header__navigation-item @Html.IsSelected("Completed")">
109
<a class="nhsuk-header__navigation-link" asp-controller="LearningPortal" asp-action="Completed">
1110
Completed activities
12-
<partial name="_NhsChevronRight" />
1311
</a>
1412
</li>
1513
<li class="nhsuk-header__navigation-item @Html.IsSelected("Available")">
1614
<a class="nhsuk-header__navigation-link" asp-controller="LearningPortal" asp-action="Available">
1715
Available activities
18-
<partial name="_NhsChevronRight" />
1916
</a>
2017
</li>
2118
<li class="nhsuk-header__navigation-item @Html.IsSelected(controller: "MyAccount", action: "Index")">
2219
<a class="nhsuk-header__navigation-link" asp-controller="MyAccount" asp-action="Index" asp-route-dlsSubApplication="@DlsSubApplication.LearningPortal.UrlSegment">
2320
My account
24-
<partial name="_NhsChevronRight" />
2521
</a>
2622
</li>

‎DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml‎

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,38 @@
1-
<footer>
2-
<div class="nhsuk-footer" id="nhsuk-footer">
1+
<footer role="contentinfo">
2+
<div class="nhsuk-footer-container">
33
<div class="nhsuk-width-container">
44
<h2 class="nhsuk-u-visually-hidden">Support links</h2>
5-
<ul class="nhsuk-footer__list">
6-
<li class="nhsuk-footer__list-item">
7-
<a class="nhsuk-footer__list-item-link" target="_blank" asp-controller="LearningSolutions" asp-action="Contact">Contact us <span class="nhsuk-u-visually-hidden">(opens new browser window)</span></a>
8-
</li>
9-
<li class="nhsuk-footer__list-item">
10-
<a class="nhsuk-footer__list-item-link" target="_blank" asp-controller="LearningSolutions" asp-action="Terms">Terms of use <span class="nhsuk-u-visually-hidden">(opens new browser window)</span></a>
11-
</li>
12-
<li class="nhsuk-footer__list-item">
13-
<a class="nhsuk-footer__list-item-link" target="_blank" asp-controller="LearningSolutions" asp-action="AcceptableUsePolicy">Acceptable use policy <span class="nhsuk-u-visually-hidden">(opens new browser window)</span></a>
14-
</li>
15-
<li class="nhsuk-footer__list-item">
16-
<a class="nhsuk-footer__list-item-link" target="_blank" asp-controller="LearningSolutions" asp-action="AccessibilityHelp">Accessibility <span class="nhsuk-u-visually-hidden">(opens new browser window)</span></a>
17-
</li>
18-
<li class="nhsuk-footer__list-item">
19-
<a class="nhsuk-footer__list-item-link" target="_blank" asp-controller="CookieConsent" asp-action="CookiePolicy">Cookie policy <span class="nhsuk-u-visually-hidden">(opens new browser window)</span></a>
20-
</li>
21-
<li class="nhsuk-footer__list-item">
22-
<a class="nhsuk-footer__list-item-link" target="_blank" asp-controller="LearningSolutions" asp-action="PrivacyNotice">Privacy <span class="nhsuk-u-visually-hidden">(opens new browser window)</span></a>
23-
</li>
24-
</ul>
25-
<p class="nhsuk-footer__copyright">&copy; NHS England @DateTime.Now.Year</p>
5+
<div class="nhsuk-footer">
6+
<ul class="nhsuk-footer__list">
7+
<li class="nhsuk-footer__list-item">
8+
<a class="nhsuk-footer__list-item-link" target="_blank" asp-controller="LearningSolutions" asp-action="Contact">Contact us <span class="nhsuk-u-visually-hidden">(opens new browser window)</span></a>
9+
</li>
10+
<li class="nhsuk-footer__list-item">
11+
<a class="nhsuk-footer__list-item-link" target="_blank" asp-controller="LearningSolutions" asp-action="Terms">Terms of use <span class="nhsuk-u-visually-hidden">(opens new browser window)</span></a>
12+
</li>
13+
</ul>
14+
<ul class="nhsuk-footer__list">
15+
<li class="nhsuk-footer__list-item">
16+
<a class="nhsuk-footer__list-item-link" target="_blank" asp-controller="LearningSolutions" asp-action="AcceptableUsePolicy">Acceptable use policy <span class="nhsuk-u-visually-hidden">(opens new browser window)</span></a>
17+
</li>
18+
<li class="nhsuk-footer__list-item">
19+
<a class="nhsuk-footer__list-item-link" target="_blank" asp-controller="CookieConsent" asp-action="CookiePolicy">Cookie policy <span class="nhsuk-u-visually-hidden">(opens new browser window)</span></a>
20+
</li>
21+
</ul>
22+
<ul class="nhsuk-footer__list">
23+
<li class="nhsuk-footer__list-item">
24+
<a class="nhsuk-footer__list-item-link" target="_blank" asp-controller="LearningSolutions" asp-action="PrivacyNotice">Privacy <span class="nhsuk-u-visually-hidden">(opens new browser window)</span></a>
25+
</li>
26+
</ul>
27+
<ul class="nhsuk-footer__list">
28+
<li class="nhsuk-footer__list-item">
29+
<a class="nhsuk-footer__list-item-link" target="_blank" asp-controller="LearningSolutions" asp-action="AccessibilityHelp">Accessibility <span class="nhsuk-u-visually-hidden">(opens new browser window)</span></a>
30+
</li>
31+
</ul>
32+
</div>
33+
<div>
34+
<p class="nhsuk-footer__copyright">&copy; NHS England @DateTime.Now.Year</p>
35+
</div>
2636
</div>
2737
</div>
2838
</footer>

0 commit comments

Comments
 (0)