Skip to content

Commit 0adc989

Browse files
Merge pull request #1297 from TechnologyEnhancedLearning/Merge-into-My-Learningpageredesign
Merge into my learning page redesign
2 parents d73ad90 + 081fa3d commit 0adc989

File tree

4 files changed

+93
-1
lines changed

4 files changed

+93
-1
lines changed

LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,57 @@ body {
44
overflow-wrap: break-word;
55
}
66

7+
.nhsuk-header {
8+
padding: 0 px2rem(32);
9+
}
10+
11+
.nhsuk-hero {
12+
background-color: $color_nhsuk-blue;
13+
color: #fff;
14+
position: relative;
15+
}
16+
17+
.nhsuk-hero a,
18+
.nhsuk-hero a:visited,
19+
.nhsuk-hero a:hover,
20+
.nhsuk-hero a:active,
21+
.nhsuk-hero i {
22+
color: $color_nhsuk-white;
23+
}
24+
25+
26+
.nhsuk-width-container.app-width-container {
27+
max-width: px2rem(1208);
28+
margin: 0 auto;
29+
padding-left: px2rem(32);
30+
padding-right: px2rem(32);
31+
}
32+
33+
.nhsuk-header .nhsuk-width-container.app-width-container {
34+
max-width: px2rem(1144);
35+
margin: 0 auto;
36+
}
37+
38+
.nhsuk-width-container.app-width-container.beta-banner {
39+
padding: px2rem(8) px2rem(32);
40+
max-width: px2rem(1208);
41+
margin: 0 auto;
42+
}
43+
44+
.nhsuk-header .nhsuk-header__container::after {
45+
content: none;
46+
}
47+
48+
.nhsuk-header__navigation.app-width-container {
49+
max-width: px2rem(1144);
50+
}
51+
52+
.app-width-container--full {
53+
margin: 0;
54+
max-width: none
55+
}
56+
57+
758

859
.app-main-wrapper--no-padding {
960
padding: 0

LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,25 @@
44
ViewData["Title"] = "My account details";
55
var isgeneralUser = User.IsInRole("BasicUser");
66
}
7+
@section NavBreadcrumbs {
8+
9+
<section class="nhsuk-hero">
10+
<div class="nhsuk-width-container app-width-container">
11+
<div class="nhsuk-grid-row">
12+
<div class="nhsuk-grid-column-full">
13+
14+
<div class="nhsuk-u-padding-top-3 nhsuk-u-padding-bottom-3">
15+
<a href="/">Home</a>
16+
<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>
17+
</div>
18+
<div class="nhsuk-u-padding-top-4 nhsuk-u-padding-bottom-7">
19+
<h1 class="nhsuk-heading-xl">My account</h1>
20+
</div>
21+
</div>
22+
</div>
23+
</div>
24+
</section>
25+
}
726
<div class="bg-white nhsuk-u-padding-bottom-9">
827
<div class="nhsuk-width-container app-width-container">
928
<div class="nhsuk-u-reading-width">

LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,27 @@
1717
<link rel="stylesheet" type="text/css" href="~/css/nhsuk/pages/mylearning.css" asp-append-version="true" />
1818

1919
}
20+
21+
@section NavBreadcrumbs {
22+
23+
<section class="nhsuk-hero">
24+
<div class="nhsuk-width-container app-width-container">
25+
<div class="nhsuk-grid-row">
26+
<div class="nhsuk-grid-column-full">
27+
28+
<div class="nhsuk-u-padding-top-3 nhsuk-u-padding-bottom-3">
29+
<a href="/">Home</a>
30+
<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>
31+
</div>
32+
<div class="nhsuk-u-padding-top-4 nhsuk-u-padding-bottom-7">
33+
<h1 class="nhsuk-heading-xl">My learning activity</h1>
34+
</div>
35+
</div>
36+
</div>
37+
</div>
38+
</section>
39+
}
40+
2041
<div class="my-learning">
2142
<div class="nhsuk-width-container app-width-container">
2243
<div class="nhsuk-grid-row nhsuk-u-padding-top-9 nhsuk-u-padding-bottom-9">
@@ -25,7 +46,7 @@
2546
{
2647
<vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />
2748
}
28-
<h1 class="nhsuk-heading-xl">My learning</h1>
49+
@* <h1 class="nhsuk-heading-xl">My learning</h1> *@
2950
<p class="nhsuk-body-l">
3051
You can use this page to search and filter learning resources you've accessed, download certificates and generate a report
3152
of your activity.

LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
@RenderSection("NavBreadcrumbs", false)
9090
</div>
9191

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

0 commit comments

Comments
 (0)