Skip to content

Merge into my learning page redesign #1297

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
Parent: TD-5711: My Learning page redesign
merged 4 commits into from
Aug 1, 2025
Merged

Merge into my learning page redesign #1297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb3874a
Breadcrumb banner
OluwatobiAwe Jul 31, 2025
a67dc13
padding changes
OluwatobiAwe Jul 31, 2025
40ae84a
Merge pull request #1294 from TechnologyEnhancedLearning/Develop/Feat…
OluwatobiAwe Jul 31, 2025
081fa3d
Merge branch 'Develop/Feature-Revised-My-Learning-implementation' int…
swapnamol-abraham Aug 1, 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
51 changes: 51 additions & 0 deletions LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,57 @@ body {
overflow-wrap: break-word;
}

.nhsuk-header {
padding: 0 px2rem(32);
}

.nhsuk-hero {
background-color: $color_nhsuk-blue;
color: #fff;
position: relative;
}

.nhsuk-hero a,
.nhsuk-hero a:visited,
.nhsuk-hero a:hover,
.nhsuk-hero a:active,
.nhsuk-hero i {
color: $color_nhsuk-white;
}


.nhsuk-width-container.app-width-container {
max-width: px2rem(1208);
margin: 0 auto;
padding-left: px2rem(32);
padding-right: px2rem(32);
}

.nhsuk-header .nhsuk-width-container.app-width-container {
max-width: px2rem(1144);
margin: 0 auto;
}

.nhsuk-width-container.app-width-container.beta-banner {
padding: px2rem(8) px2rem(32);
max-width: px2rem(1208);
margin: 0 auto;
}

.nhsuk-header .nhsuk-header__container::after {
content: none;
}

.nhsuk-header__navigation.app-width-container {
max-width: px2rem(1144);
}

.app-width-container--full {
margin: 0;
max-width: none
}



.app-main-wrapper--no-padding {
padding: 0
Expand Down
19 changes: 19 additions & 0 deletions LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,25 @@
ViewData["Title"] = "My account details";
var isgeneralUser = User.IsInRole("BasicUser");
}
@section NavBreadcrumbs {

<section class="nhsuk-hero">
<div class="nhsuk-width-container app-width-container">
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">

<div class="nhsuk-u-padding-top-3 nhsuk-u-padding-bottom-3">
<a href="/">Home</a>
<i class="fa-solid fa-chevron-right nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-1 nhsuk-u-padding-left-2 nhsuk-u-padding-right-2"></i>
</div>
<div class="nhsuk-u-padding-top-4 nhsuk-u-padding-bottom-7">
<h1 class="nhsuk-heading-xl">My account</h1>
</div>
</div>
</div>
</div>
</section>
}
<div class="bg-white nhsuk-u-padding-bottom-9">
<div class="nhsuk-width-container app-width-container">
<div class="nhsuk-u-reading-width">
Expand Down
23 changes: 22 additions & 1 deletion LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,27 @@
<link rel="stylesheet" type="text/css" href="~/css/nhsuk/pages/mylearning.css" asp-append-version="true" />

}

@section NavBreadcrumbs {

<section class="nhsuk-hero">
<div class="nhsuk-width-container app-width-container">
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">

<div class="nhsuk-u-padding-top-3 nhsuk-u-padding-bottom-3">
<a href="/">Home</a>
<i class="fa-solid fa-chevron-right nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-1 nhsuk-u-padding-left-2 nhsuk-u-padding-right-2"></i>
</div>
<div class="nhsuk-u-padding-top-4 nhsuk-u-padding-bottom-7">
<h1 class="nhsuk-heading-xl">My learning activity</h1>
</div>
</div>
</div>
</div>
</section>
}

<div class="my-learning">
<div class="nhsuk-width-container app-width-container">
<div class="nhsuk-grid-row nhsuk-u-padding-top-9 nhsuk-u-padding-bottom-9">
Expand All @@ -25,7 +46,7 @@
{
<vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />
}
<h1 class="nhsuk-heading-xl">My learning</h1>
@* <h1 class="nhsuk-heading-xl">My learning</h1> *@
<p class="nhsuk-body-l">
You can use this page to search and filter learning resources you've accessed, download certificates and generate a report
of your activity.
Expand Down
1 change: 1 addition & 0 deletions LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
@RenderSection("NavBreadcrumbs", false)
</div>


<div class="nhsuk-width-container app-width-container--full">
<main role="main" id="maincontent" class="nhsuk-main-wrapper app-main-wrapper--no-padding nhsuk-bg-white">
@* This print header HAS to be within the main component and not in the header component otherwise there is a problem when
Expand Down
Loading