Skip to content

Commit cde46f7

Browse files
committed
TD-5761: Merging latest from feature branch.
2 parents fcff003 + 40ae84a commit cde46f7

File tree

3 files changed

+65
-11
lines changed

3 files changed

+65
-11
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,21 @@ body {
99
padding: 0 px2rem(32);
1010
}
1111

12+
.nhsuk-hero {
13+
background-color: $color_nhsuk-blue;
14+
color: #fff;
15+
position: relative;
16+
}
17+
18+
.nhsuk-hero a,
19+
.nhsuk-hero a:visited,
20+
.nhsuk-hero a:hover,
21+
.nhsuk-hero a:active,
22+
.nhsuk-hero i {
23+
color: $color_nhsuk-white;
24+
}
25+
26+
1227
.nhsuk-width-container.app-width-container {
1328
max-width: px2rem(1208);
1429
margin: 0 auto;

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

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,36 @@
44
ViewData["Title"] = "Personal Details";
55
var isgeneralUser = User.IsInRole("BasicUser");
66
}
7+
@section NavBreadcrumbs {
78

8-
<div class="nhsuk-width-container app-width-container">
9-
<div class="nhsuk-grid-row my_account_section">
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+
}
26+
<div class="bg-white nhsuk-u-padding-bottom-9">
27+
<div class="nhsuk-width-container app-width-container">
28+
<div class="nhsuk-grid-row">
1029
<div class="nhsuk-grid-column-one-third">
1130
@await Component.InvokeAsync("SideNav", new { groupTitle = "Account" })
1231
</div>
13-
<div class="nhsuk-grid-column-two-thirds">
14-
@* <h1 class="nhsuk-heading-xl">@ViewData["Title"]</h1> *@
15-
<h2 class="nhsuk-heading-l">@ViewData["Title"]</h2>
16-
@if (isgeneralUser)
17-
{
18-
<div class="nhsuk-inset-text">
32+
<div class="nhsuk-grid-column-two-thirds">
33+
<h2 class="nhsuk-heading-l nhsuk-u-padding-top-7">@ViewData["Title"]</h2>
34+
@if (isgeneralUser)
35+
{
36+
<div class="nhsuk-inset-text">
1937
<span class="nhsuk-u-visually-hidden">Information: </span>
2038
<p>If you have a work email address you can upgrade to a full user account. Full users are able to access learning community resources, contribute and share knowledge and content. </p>
2139
</div>
@@ -112,6 +130,6 @@
112130
</form>
113131
}
114132
</div>
115-
116133
</div>
117-
</div>
134+
</div>
135+
</div>

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.

0 commit comments

Comments
 (0)