Skip to content

TD-5327 update nhs design system #3100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 31, 2025
Merged

TD-5327 update nhs design system #3100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d9c016
Header changes for NHS Design System v 9
kevwhitt-hee Jan 31, 2025
226edb1
TD-5327 Updates to latest version and finishes fixing styling issues
kevwhitt-hee Jan 31, 2025
3ae33b6
Sets nav width to same as width container override and loads nhsuk js
kevwhitt-hee Jan 31, 2025
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
236 changes: 236 additions & 0 deletions DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions DigitalLearningSolutions.Web/Scripts/nhsuk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -20,6 +19,5 @@ document.addEventListener(
SkipLink();
Radios();
Checkboxes();
Card();
},
);
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Styles/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,27 @@
<li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.Dashboard)">
<a class="nhsuk-header__navigation-link" asp-controller="Frameworks" asp-action="Index">
Dashboard
<partial name="_NhsChevronRight" />
</a>
</li>
<li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.Frameworks)">
<a class="nhsuk-header__navigation-link" asp-controller="Frameworks" asp-action="ViewFrameworks" asp-route-tabname="Mine">
Frameworks
<partial name="_NhsChevronRight" />
</a>
</li>
<feature name="@(FeatureFlags.WorkforceManagerInterface)">
<li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.RolesProfiles)">
<a class="nhsuk-header__navigation-link" asp-controller="RoleProfiles" asp-action="ViewRoleProfiles" asp-route-tabname="Mine">
Role Profiles
<partial name="_NhsChevronRight" />
</a>
</li>
</feature>
<li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.Support)">
<a class="nhsuk-header__navigation-link" asp-controller="Support" asp-action="Index" asp-route-dlsSubApplication="@DlsSubApplication.Frameworks.UrlSegment">
Support
<partial name="_NhsChevronRight" />
</a>
</li>
<li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.MyAccount)">
<a class="nhsuk-header__navigation-link" asp-controller="MyAccount" asp-action="Index" asp-route-dlsSubApplication="@DlsSubApplication.Frameworks.UrlSegment">
My account
<partial name="_NhsChevronRight" />
</a>
</li>
2 changes: 0 additions & 2 deletions DigitalLearningSolutions.Web/Views/LearningMenu/Shared/_NavMenuItems.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
<li class="nhsuk-header__navigation-item">
<a class="nhsuk-header__navigation-link" asp-controller="LearningMenu" asp-action="Close">
Learning portal
<partial name="_NhsChevronRight" />
</a>
</li>
<li class="nhsuk-header__navigation-item">
<a class="nhsuk-header__navigation-link" asp-controller="MyAccount" asp-action="Index" asp-route-dlsSubApplication="@DlsSubApplication.LearningPortal.UrlSegment">
My account
<partial name="_NhsChevronRight" />
</a>
</li>
1 change: 1 addition & 0 deletions DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
<partial name="/Views/LearningPortal/Shared/_LoadingSpinner.cshtml" />
</div>
<partial name="_DlsFooter" />
<script src="@Url.Content("~/js/nhsuk.js")" asp-append-version="true"></script>>
@await RenderSectionAsync("scripts", false)
</div>
</body>
Expand Down
4 changes: 0 additions & 4 deletions DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_NavMenuItems.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,20 @@
<li class="nhsuk-header__navigation-item @Html.IsSelected("Current")">
<a class="nhsuk-header__navigation-link" asp-controller="LearningPortal" asp-action="Current">
Current activities
<partial name="_NhsChevronRight" />
</a>
</li>
<li class="nhsuk-header__navigation-item @Html.IsSelected("Completed")">
<a class="nhsuk-header__navigation-link" asp-controller="LearningPortal" asp-action="Completed">
Completed activities
<partial name="_NhsChevronRight" />
</a>
</li>
<li class="nhsuk-header__navigation-item @Html.IsSelected("Available")">
<a class="nhsuk-header__navigation-link" asp-controller="LearningPortal" asp-action="Available">
Available activities
<partial name="_NhsChevronRight" />
</a>
</li>
<li class="nhsuk-header__navigation-item @Html.IsSelected(controller: "MyAccount", action: "Index")">
<a class="nhsuk-header__navigation-link" asp-controller="MyAccount" asp-action="Index" asp-route-dlsSubApplication="@DlsSubApplication.LearningPortal.UrlSegment">
My account
<partial name="_NhsChevronRight" />
</a>
</li>
56 changes: 33 additions & 23 deletions DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,38 @@
<footer>
<div class="nhsuk-footer" id="nhsuk-footer">
<footer role="contentinfo">
<div class="nhsuk-footer-container">
<div class="nhsuk-width-container">
<h2 class="nhsuk-u-visually-hidden">Support links</h2>
<ul class="nhsuk-footer__list">
<li class="nhsuk-footer__list-item">
<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>
</li>
<li class="nhsuk-footer__list-item">
<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>
</li>
<li class="nhsuk-footer__list-item">
<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>
</li>
<li class="nhsuk-footer__list-item">
<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>
</li>
<li class="nhsuk-footer__list-item">
<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>
</li>
<li class="nhsuk-footer__list-item">
<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>
</li>
</ul>
<p class="nhsuk-footer__copyright">&copy; NHS England @DateTime.Now.Year</p>
<div class="nhsuk-footer">
<ul class="nhsuk-footer__list">
<li class="nhsuk-footer__list-item">
<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>
</li>
<li class="nhsuk-footer__list-item">
<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>
</li>
</ul>
<ul class="nhsuk-footer__list">
<li class="nhsuk-footer__list-item">
<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>
</li>
<li class="nhsuk-footer__list-item">
<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>
</li>
</ul>
<ul class="nhsuk-footer__list">
<li class="nhsuk-footer__list-item">
<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>
</li>
</ul>
<ul class="nhsuk-footer__list">
<li class="nhsuk-footer__list-item">
<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>
</li>
</ul>
</div>
<div>
<p class="nhsuk-footer__copyright">&copy; NHS England @DateTime.Now.Year</p>
</div>
</div>
</div>
</footer>
Loading
Loading