Merge pull request #3186 from TechnologyEnhancedLearning/Develop/Fixes/TD-5327-FixStylingIssues

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

Author: rshrirohit

DigitalLearningSolutions.Web/Views/SuperAdmin/AdminAccounts/Index.cshtml

@@ -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"
@@ -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"

DigitalLearningSolutions.Web/Views/SuperAdmin/Delegates/Index.cshtml

@@ -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"
@@ -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"

DigitalLearningSolutions.Web/Views/SuperAdmin/Users/Index.cshtml

@@ -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"
@@ -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"

DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/EmailDelegates/Index.cshtml

@@ -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">

DigitalLearningSolutions.Web/Views/UserFeedback/GuestFeedbackStart.cshtml

@@ -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">

DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackComplete.cshtml

@@ -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">

DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAchieved.cshtml

@@ -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">

DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAttempted.cshtml

@@ -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">

DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskDifficulty.cshtml

@@ -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">