Skip to content

STyle corrections for dashboard page #1434

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 2 commits into from
Sep 23, 2025
Merged

STyle corrections for dashboard page #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eff0ec1
STyle corrections for dashboard page
swapnamol-abraham Sep 23, 2025
b3f80fd
Corrected the wordings
swapnamol-abraham Sep 23, 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
10 changes: 0 additions & 10 deletions LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,20 +139,15 @@ public async Task<IActionResult> Index(MyLearningUserActivitiesViewModel learnin
if (myLearningDashboard == "my-in-progress")
{
myLearningRequestModel.Incomplete = true;
myLearningRequestModel.Failed = true;
}
else if (myLearningDashboard == "my-recent-completed")
{
myLearningRequestModel.Complete = true;
myLearningRequestModel.Passed = true;
myLearningRequestModel.Downloaded = true;
}
else if (myLearningDashboard == "my-certificates")
{
myLearningRequestModel.CertificateEnabled = true;
myLearningRequestModel.Complete = true;
myLearningRequestModel.Passed = true;
myLearningRequestModel.Downloaded = true;
}
}

Expand Down Expand Up @@ -291,20 +286,15 @@ public async Task<IActionResult> LearningHistory(MyLearningUserActivitiesViewMod
if (myLearningDashboard == "my-in-progress")
{
myLearningRequestModel.Incomplete = true;
myLearningRequestModel.Failed = true;
}
else if (myLearningDashboard == "my-recent-completed")
{
myLearningRequestModel.Complete = true;
myLearningRequestModel.Passed = true;
myLearningRequestModel.Downloaded = true;
}
else if (myLearningDashboard == "my-certificates")
{
myLearningRequestModel.CertificateEnabled = true;
myLearningRequestModel.Complete = true;
myLearningRequestModel.Passed = true;
myLearningRequestModel.Downloaded = true;
}
}

Expand Down
20 changes: 10 additions & 10 deletions LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
}

.course-card {
border: 1px solid #1C366A;
border-radius: 8px;
box-shadow: 2px 2px 0 #1C366A;
border: 1px solid #d8dde0;
border-radius: 8px;
box-shadow: 2px 2px 0 #d8dde0;
}

.dashboard-card-content {
Expand Down Expand Up @@ -201,21 +201,21 @@ div.bmj-best-practice-logo-image {
font-family: sans-serif;
}
.filteractive {
color: $nhsuk-blue;
border-color: #0b63ce;
color: $nhsuk-blue !important;
border-color: #376cac;
background-color: $nhsuk-pale-blue-color;
}

.filterinactive {
color: #6e6e6e;
border-color: #c2c2c2;
background-color: #f1f1f1;
opacity: 0.7;
color: #d8dde0;
border-color: #d8dde0;
background-color: $nhsuk-white;
opacity: 0.7;
}

filterfocus {
color: black;
background-color: #ffeb3b;
background-color: #ffb81c;
border-color: #212b32;
}
.dashboard-paging {
Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
@if (Model.MyLearnings.Type == "my-in-progress" && Model.MyLearnings.TotalCount <= 0)
{
<h3 class="nhsuk-card__heading nhsuk-heading-m">You have not accessed any learning yet.</h3>
<p class="nhsuk-card__description dashboard-card-body">Accessed resources will be displayed here. Browse from the list of resources below or search for a specific term using the search bar at the top of the screen.</p>
<p class="nhsuk-card__description dashboard-card-body">Accessed resources and courses will be displayed here. Browse from the list of resources below or search for a specific term using the search bar at the top of the screen.</p>
}
else if (Model.MyLearnings.Type == "my-certificates" && Model.MyLearnings.TotalCount <= 0)
{
Expand All @@ -169,7 +169,7 @@
<div class="nhsuk-grid-column-one-third-small-desktop nhsuk-card-group__item nhsuk-u-padding-top-3">
@if (Model.MyLearnings.Type != "my-catalogues")
{
<a tabindex="0" class="subnavwhite-link text-nowrap" asp-controller="MyLearning" asp-action="Index" asp-route-myLearningDashboard="@Model.MyLearnings.Type">View in My Learning</a>
<a tabindex="0" class="subnavwhite-link text-nowrap" asp-controller="MyLearning" asp-action="Index" asp-route-myLearningDashboard="@Model.MyLearnings.Type">View in My Learning activity</a>
}
</div>
<div class="nhsuk-grid-column-one-third-small-desktop nhsuk-card-group__item"></div>
Expand Down
Loading