diff --git a/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs b/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs index 1157fcbe..518c873b 100644 --- a/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs @@ -139,20 +139,15 @@ public async Task 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; } } @@ -291,20 +286,15 @@ public async Task 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; } } diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss index d2bec44a..b7c572fb 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss @@ -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 { @@ -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 { diff --git a/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml index 1fd3e413..4ea63101 100644 --- a/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml @@ -154,7 +154,7 @@ @if (Model.MyLearnings.Type == "my-in-progress" && Model.MyLearnings.TotalCount <= 0) {

You have not accessed any learning yet.

-

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.

+

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.

} else if (Model.MyLearnings.Type == "my-certificates" && Model.MyLearnings.TotalCount <= 0) { @@ -169,7 +169,7 @@
@if (Model.MyLearnings.Type != "my-catalogues") { - View in My Learning + View in My Learning activity }