Skip to content

TD-5327 fix styling issues after upgrade to TEL design system #3186

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 4 commits into from
Mar 19, 2025
Merged

TD-5327 fix styling issues after upgrade to TEL design system #3186

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
3811746
TD-5327 Fixes user account filter select styling
kevwhitt-hee Mar 14, 2025
43a9a0a
TD-5327 Fixes feedback go back link styling
kevwhitt-hee Mar 17, 2025
6b1bbbd
TD-5327 Removes badly styled select button label
kevwhitt-hee Mar 17, 2025
d4f86e0
TD-5327 Fixes super admin delegates and admin accounts filter drop do…
kevwhitt-hee Mar 17, 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
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Web/Views/SuperAdmin/AdminAccounts/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</div>
</div>
<div class="filter-container nhsuk-u-margin-top-5">
<div class="nhsuk-grid-column-one-quarter">
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
<vc:select-list asp-for="@nameof(Model.UserStatus)"
label="Account status"
value="@Model.UserStatus"
Expand All @@ -75,7 +75,7 @@
default-option=""
select-list-options="@ViewBag.UserStatus" />
</div>
<div class="nhsuk-grid-column-one-quarter">
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
<vc:select-list asp-for="@nameof(Model.Role)"
label="Role"
value="@Model.Role"
Expand Down
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Web/Views/SuperAdmin/Delegates/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</div>
</div>
<div class="filter-container nhsuk-u-margin-top-5">
<div class="nhsuk-grid-column-one-quarter">
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
<vc:select-list asp-for="@nameof(Model.AccountStatus)"
label="Account status"
value="@Model.AccountStatus"
Expand All @@ -66,7 +66,7 @@
default-option=""
select-list-options="@ViewBag.AccountStatus" />
</div>
<div class="nhsuk-grid-column-one-quarter">
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
<vc:select-list asp-for="@nameof(Model.LHLinkStatus)"
label="LH link status"
value="@Model.LHLinkStatus"
Expand Down
6 changes: 4 additions & 2 deletions DigitalLearningSolutions.Web/Views/SuperAdmin/Users/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@
</div>
</div>
</div>
</div>
<div class="nhsuk-grid-row">
<div class="filter-container nhsuk-u-margin-top-5">
<div class="nhsuk-grid-column-one-quarter">
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
<vc:select-list asp-for="@nameof(Model.UserStatus)"
label="User status"
value="@Model.UserStatus"
Expand All @@ -61,7 +63,7 @@
default-option=""
select-list-options="@ViewBag.UserStatus" />
</div>
<div class="nhsuk-grid-column-one-quarter">
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
<vc:select-list asp-for="@nameof(Model.EmailStatus)"
label="Email status"
value="@Model.EmailStatus"
Expand Down
18 changes: 9 additions & 9 deletions DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/EmailDelegates/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@
}
else
{
<div class="nhsuk-grid-row nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-6">
<div class="nhsuk-grid-column-full">
<form id="select-all-form" method="get" asp-action="Index">
<label class="nhsuk-label--s nhsuk-u-margin-bottom-1">Select</label>
<button type="submit" class="nhsuk-button select-all-button" id="select-all-button" name="selectAll" value="true">Select all</button>
<button type="submit" class="nhsuk-button select-all-button" id="deselect-all-button" name="selectAll" value="false">Deselect all</button>
</form>
</div>
</div>


<partial name="SearchablePage/_SearchResultsCountWithAlert" model="Model" />
<div class="nhsuk-grid-row nhsuk-u-margin-top-4">
<div class="nhsuk-grid-column-full">
<form id="select-all-form" method="get" asp-action="Index">
<button type="submit" class="nhsuk-button select-all-button" id="select-all-button" name="selectAll" value="true">Select all</button>
<button type="submit" class="nhsuk-button select-all-button" id="deselect-all-button" name="selectAll" value="false">Deselect all</button>
</form>
</div>
</div>
<form method="post">
<div class="nhsuk-form-group nhsuk-u-margin-top-4">
<div class="nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3">
Expand Down
30 changes: 9 additions & 21 deletions DigitalLearningSolutions.Web/Views/UserFeedback/GuestFeedbackStart.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,16 @@
<link rel="stylesheet" href="@Url.Content("~/css/userFeedback/userFeedback.css")" asp-append-version="true">

@section NavBreadcrumbs {
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item">
<a class="nhsuk-breadcrumb__link trigger-loader" href="@Model.SourceUrl">
@if (Model.SourcePageTitle != String.Empty)
{
<div><partial name="_NhsChevronLeft" class="feedback-chevron" /> Go back to Welcome page</div>

}
@if (Model.SourcePageTitle == String.Empty)
{
<div><partial name="_NhsChevronLeft" class="feedback-chevron" /> Go back</div>
}
</a>
</li>
</ol>
<p class="nhsuk-breadcrumb__back">
<a class="nhsuk-breadcrumb__link" href="@Model.SourceUrl">Go back to @Model.SourcePageTitle</a>
</p>
<div class="nhsuk-width-container">
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" href="@Model.SourceUrl">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
Go back
</a>
</div>
</nav>
</div>
}

<div class="nhsuk-grid-row">
Expand Down
20 changes: 9 additions & 11 deletions DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackComplete.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,16 @@
<link rel="stylesheet" href="@Url.Content("~/css/userFeedback/userFeedback.css")" asp-append-version="true">

@section NavBreadcrumbs {
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item">
@* no link required in the Thank You For The Feedback page*@
</li>
</ol>
<p class="nhsuk-breadcrumb__back">
<a class="nhsuk-breadcrumb__link" href="@Model.SourceUrl">Go back to @Model.SourcePageTitle</a>
</p>
<div class="nhsuk-width-container">
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" href="@Model.SourceUrl">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
Go back
</a>
</div>
</nav>
</div>
}

<div class="nhsuk-grid-row">
Expand Down
29 changes: 9 additions & 20 deletions DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAchieved.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,16 @@
<link rel="stylesheet" href="@Url.Content("~/css/userFeedback/userFeedback.css")" asp-append-version="true">

@section NavBreadcrumbs {
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item">
<a class="nhsuk-breadcrumb__link trigger-loader" href="@Model.SourceUrl">
@if (Model.SourcePageTitle != String.Empty)
{
<div><partial name="_NhsChevronLeft" />Go back to @Model.SourcePageTitle</div>
}
@if (Model.SourcePageTitle == String.Empty)
{
<div><partial name="_NhsChevronLeft" />Go back</div>
}
</a>
</li>
</ol>
<p class="nhsuk-breadcrumb__back">
<a class="nhsuk-breadcrumb__link" href="@Model.SourceUrl">Go back to @Model.SourcePageTitle</a>
</p>
<div class="nhsuk-width-container">
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" href="@Model.SourceUrl">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
Go back
</a>
</div>
</nav>
</div>
}

<div class="nhsuk-grid-row">
Expand Down
22 changes: 9 additions & 13 deletions DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAttempted.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,16 @@
<link rel="stylesheet" href="@Url.Content("~/css/userFeedback/userFeedback.css")" asp-append-version="true">

@section NavBreadcrumbs {
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item">
<a class="nhsuk-breadcrumb__link trigger-loader" href="@Model.SourceUrl">
<div><partial name="_NhsChevronLeft" />Go back</div>
</a>
</li>
</ol>
<p class="nhsuk-breadcrumb__back">
<a class="nhsuk-breadcrumb__link" href="@Model.SourceUrl">Go back</a>
</p>
<div class="nhsuk-width-container">
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" href="@Model.SourceUrl">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
Go back
</a>
</div>
</nav>
</div>
}

<div class="nhsuk-grid-row">
Expand Down
22 changes: 9 additions & 13 deletions DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskDifficulty.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,16 @@
<link rel="stylesheet" href="@Url.Content("~/css/userFeedback/userFeedback.css")" asp-append-version="true">

@section NavBreadcrumbs {
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item">
<a class="nhsuk-breadcrumb__link trigger-loader" href="@Model.SourceUrl">
<div><partial name="_NhsChevronLeft" />Go back</div>
</a>
</li>
</ol>
<p class="nhsuk-breadcrumb__back">
<a class="nhsuk-breadcrumb__link" href="@Model.SourceUrl">Go back</a>
</p>
<div class="nhsuk-width-container">
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" href="@Model.SourceUrl">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
Go back
</a>
</div>
</nav>
</div>
}

<div class="nhsuk-grid-row">
Expand Down
Loading