Tweak color and container colors and shapes

gaepdit · Nov 2, 2023 · 5e0e4b8 · 5e0e4b8
1 parent 1c1f92e
commit 5e0e4b8
Show file tree

Hide file tree

Showing 32 changed files with 106 additions and 102 deletions.
diff --git a/FMS/Pages/Cabinets/Add.cshtml b/FMS/Pages/Cabinets/Add.cshtml
@@ -9,7 +9,7 @@
     ViewData["Title"] = "Add Cabinet";
 }
 <h1>@ViewData["Title"]</h1>
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="row">

diff --git a/FMS/Pages/Cabinets/Details.cshtml b/FMS/Pages/Cabinets/Details.cshtml
@@ -18,7 +18,7 @@
 <hr />
 <partial name="_AlertPartial" for="Message" />
 
-<div class="container">
+<div class="container bg-light-subtle rounded-3">
     <p>
         <em>File Label Range</em> is used for displaying the storage cabinets used for each File or Facility. The range is
         from the First File Label for the cabinet up to (but not including) the First File Label for the next cabinet.

diff --git a/FMS/Pages/Cabinets/Edit.cshtml b/FMS/Pages/Cabinets/Edit.cshtml
@@ -10,7 +10,7 @@
 }
 <h1>@ViewData["Title"]</h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="row">

diff --git a/FMS/Pages/Facilities/Add.cshtml b/FMS/Pages/Facilities/Add.cshtml
@@ -14,7 +14,7 @@
     ViewData["Title"] = "Add Facility";
 }
 <h1>@ViewData["Title"]</h1>
-<div class="p-3 rounded-3 bg-light">
+<div class="p-3 rounded-3 bg-light-subtle">
     <form method="post" asp-fragment="ConfirmFacility">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="mb-3 row">
@@ -204,7 +204,7 @@
                 <button asp-page-handler="Confirm" type="submit" class="btn btn-warning col-sm-5 col-md-4 mb-3 mb-sm-0">
                     Create the facility
                 </button>
-                <a asp-page="./Add" class="btn btn-outline-secondary text-dark bg-light col-sm-4 col-md-3">Cancel (clear the form)</a>
+                <a asp-page="./Add" class="btn btn-outline-secondary text-body bg-light-subtle col-sm-4 col-md-3">Cancel (clear the form)</a>
                 <input asp-for="Facility.Address" type="hidden" />
                 <input asp-for="Facility.City" type="hidden" />
                 <input asp-for="Facility.Latitude" type="hidden" />

diff --git a/FMS/Pages/Facilities/Delete.cshtml b/FMS/Pages/Facilities/Delete.cshtml
@@ -7,7 +7,7 @@
 
 <h1><em>Confirm</em> @ViewData["Title"]</h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle p-3 rounded-3">
     <p class="lead text-danger font-weight-medium">Are you sure you want to delete this Facility?</p>
     <dl class="row">
         <dt class="col-sm-3">

diff --git a/FMS/Pages/Facilities/Details.cshtml b/FMS/Pages/Facilities/Details.cshtml
@@ -159,7 +159,7 @@
     @if (Model.FacilityDetail.Active &&
     (User.IsInRole(UserRoles.FileCreator) || User.IsInRole(UserRoles.FileEditor)))
     {
-        <div class="container bg-light pt-3 mt-5">
+        <div class="container bg-light-subtle pt-3 mt-5 rounded-3">
             <h3 class="h5">Add a Retention Record</h3>
             <form method="post" asp-page-handler="RetentionRecord" asp-fragment="retention-records">
                 <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>

diff --git a/FMS/Pages/Facilities/Edit.cshtml b/FMS/Pages/Facilities/Edit.cshtml
@@ -17,7 +17,7 @@
     @ViewData["Title"]
 </h1>
 
-<div class="p-3 rounded-3 bg-light">
+<div class="p-3 rounded-3 bg-light-subtle">
     <form method="post">
         <input type="hidden" asp-for="Facility.Active" />
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>

diff --git a/FMS/Pages/Facilities/EditRetentionRecord.cshtml b/FMS/Pages/Facilities/EditRetentionRecord.cshtml
@@ -10,7 +10,7 @@
 }
 <h1>@ViewData["Title"]</h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post" asp-fragment="retention-records">
         <p>
             For Facility <strong>@Html.DisplayFor(e => e.Facility.FacilityNumber):</strong> 

diff --git a/FMS/Pages/Facilities/Index.cshtml b/FMS/Pages/Facilities/Index.cshtml
@@ -12,7 +12,7 @@
 
 <h1>@ViewData["Title"]</h1>
 
-<div class="p-3 rounded-3 bg-light">
+<div class="p-3 rounded-3 bg-light-subtle">
     <form method="get" asp-fragment="SearchResults">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="mb-3 row">
@@ -118,7 +118,7 @@
 
 @if (Model.ShowResults)
 {
-    <div class="border-top" id="SearchResults">
+    <div class="border-top bg-light-subtle rounded-3" id="SearchResults">
         @if (Model.FacilityList.CurrentCount == 0)
         {
             <div class="container pt-3">
@@ -166,7 +166,7 @@
                         </div>
                     </div>
                 </caption>
-                <thead class="table-light">
+                <thead class="thead-dark">
                     <tr>
                         <th scope="col" class="text-nowrap">
                             <a asp-fragment="SearchResults" asp-all-route-data="Model.Spec.AsRouteValues" asp-route-handler="search"
@@ -207,7 +207,7 @@
                 <tbody>
                     @foreach (FacilitySummaryDto item in Model.FacilityList.Items)
                     {
-                        <tr class="@(!item.Active ? "table-secondary" : "")">
+                        <tr class="@(!item.Active ? "table-warning" : "")">
                             <td>
                                 <a asp-page="Details" asp-route-id="@item.Id" class="btn @(item.Active ? "btn-outline-info" : "btn-outline-secondary") btn-sm">
                                     @Html.DisplayFor(m => item.FacilityNumber, "StringOrNone")
@@ -246,7 +246,7 @@
                 </tbody>
             </table>
 
-            <partial name="_PaginationNav" model="(Model.FacilityList, Model.Spec.AsRouteValues)" />
+            <span class="align-top"><partial name="_PaginationNav" model="(Model.FacilityList, Model.Spec.AsRouteValues)" /></span>
         }
     </div>
 }
diff --git a/FMS/Pages/Facilities/Map.cshtml b/FMS/Pages/Facilities/Map.cshtml
@@ -97,7 +97,7 @@
 
 @if (Model.ShowResults)
 {
-    <div class="border-top text-muted" id="SearchResults">
+    <div class="border-top text-muted bg-light-subtle" id="SearchResults">
         @if (Model.ShowNone)
         {
             <div class="container pt-3">

diff --git a/FMS/Pages/Facilities/Undelete.cshtml b/FMS/Pages/Facilities/Undelete.cshtml
@@ -7,7 +7,7 @@
 
 <h1><em>Confirm</em> @ViewData["Title"]</h1>
 
-<div class="container">
+<div class="container p-3 rounded-3 bg-light-subtle">
     <p class="lead text-warning font-weight-medium">Are you sure you want to restore (undelete) this Facility?</p>
     <dl class="row">
         <dt class="col-sm-3">

diff --git a/FMS/Pages/Files/Details.cshtml b/FMS/Pages/Files/Details.cshtml
@@ -38,7 +38,7 @@
     @if (Model.FileDetail.Facilities != null && Model.FileDetail.Facilities.Count > 0)
     {
         <table class="table table-borderless" aria-label="List of facilities in this file">
-            <thead class="table-light">
+            <thead class="thead-light">
                 <tr>
                     <th scope="col">Facility</th>
                     <th scope="col">Name</th>

diff --git a/FMS/Pages/Files/Index.cshtml b/FMS/Pages/Files/Index.cshtml
@@ -13,7 +13,7 @@
 
 <h1>@ViewData["Title"]</h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="get" asp-fragment="SearchResults">
         <div class="mb-3 row">
             <div class="col-md-3">
@@ -39,7 +39,7 @@
 
     @if (Model.FileList.CurrentCount > 0)
     {
-        <table class="table" aria-label="File search results">
+        <table class="table bg-light-subtle" aria-label="File search results">
             <caption class="container border-top py-3">
                 <div class="row">
                     <div class="col-md"></div>
@@ -51,7 +51,7 @@
                     </div>
                 </div>
             </caption>
-            <thead class="table-light">
+            <thead class="thead-light">
                 <tr>
                     <th scope="col">File Label</th>
                     <th scope="col">Cabinets</th>
@@ -81,7 +81,7 @@
     }
     else
     {
-        <div class="container mt-2">
+        <div class="container mt-2 bg-light-subtle">
             <p class="lead text-info">No search results found.</p>
         </div>
     }

diff --git a/FMS/Pages/Maintenance/BudgetCode/Add.cshtml b/FMS/Pages/Maintenance/BudgetCode/Add.cshtml
@@ -10,7 +10,7 @@
     ViewData["Title"] = $"Add {MaintenanceOptions.BudgetCode}";
 }
 <h1>@ViewData["Title"]</h1>
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="row mb-3">

diff --git a/FMS/Pages/Maintenance/BudgetCode/Edit.cshtml b/FMS/Pages/Maintenance/BudgetCode/Edit.cshtml
@@ -17,7 +17,7 @@
     }
 </h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <input type="hidden" asp-for="BudgetCode.Active" />

diff --git a/FMS/Pages/Maintenance/BudgetCode/Index.cshtml b/FMS/Pages/Maintenance/BudgetCode/Index.cshtml
@@ -12,7 +12,7 @@
 
 <form method="post">
     <table class="table" aria-label="List of budget codes">
-        <thead class="table-light">
+        <thead class="thead-light">
             <tr>
                 <th scope="col">Code</th>
                 <th scope="col">Name</th>
@@ -24,7 +24,7 @@
         <tbody>
             @foreach (var item in Model.BudgetCodes)
             {
-                <tr class="@(!item.Active ? "table-secondary" : "")">
+                <tr class="@(!item.Active ? "table-warning" : "")">
                     <td class="text-nowrap">
                         @Html.DisplayFor(m => item.Code, "StringOrNone")
                         @Html.DisplayFor(m => item.Active, "BoolRemoved")
@@ -40,11 +40,11 @@
                         <a asp-page="Edit" asp-route-id="@item.Id" class="btn btn-outline-primary btn-sm">Edit</a>
                         @if (item.Active)
                         {
-                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Remove from list</button>
+                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Remove from list</button>
                         }
                         else
                         {
-                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Restore to list</button>
+                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Restore to list</button>
                         }
                     </td>
                 </tr>

diff --git a/FMS/Pages/Maintenance/ComplianceOfficer/Index.cshtml b/FMS/Pages/Maintenance/ComplianceOfficer/Index.cshtml
@@ -13,7 +13,7 @@
 <p>New users are added to the Compliance Officers list the first time they sign into FMS.</p>
 <form method="post">
     <table class="table" aria-label="List of compliance officers">
-        <thead class="table-light">
+        <thead class="thead-light">
         <tr>
             <th scope="col">Name</th>
             <th scope="col">Email</th>
@@ -32,11 +32,11 @@
                 <td class="text-nowrap">
                     @if (item.Active)
                     {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Remove from list</button>
+                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Remove from list</button>
                     }
                     else
                     {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Restore to list</button>
+                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Restore to list</button>
                     }
                 </td>
             </tr>

diff --git a/FMS/Pages/Maintenance/FacilityStatus/Add.cshtml b/FMS/Pages/Maintenance/FacilityStatus/Add.cshtml
@@ -10,7 +10,7 @@
     ViewData["Title"] = $"Add {MaintenanceOptions.FacilityStatus}";
 }
 <h1>@ViewData["Title"]</h1>
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="row">

diff --git a/FMS/Pages/Maintenance/FacilityStatus/Edit.cshtml b/FMS/Pages/Maintenance/FacilityStatus/Edit.cshtml
@@ -17,7 +17,7 @@
     }
 </h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <input type="hidden" asp-for="FacilityStatus.Active" />

diff --git a/FMS/Pages/Maintenance/FacilityStatus/Index.cshtml b/FMS/Pages/Maintenance/FacilityStatus/Index.cshtml
@@ -21,7 +21,7 @@
         <tbody>
         @foreach (var item in Model.FacilityStatuses)
         {
-            <tr class="@(!item.Active ? "table-secondary" : "")">
+            <tr class="@(!item.Active ? "table-warning" : "")">
                 <td class="text-nowrap">
                     @Html.DisplayFor(m => item.Status, "StringOrNone")
                     @Html.DisplayFor(m => item.Active, "BoolRemoved")
@@ -30,11 +30,11 @@
                     <a asp-page="Edit" asp-route-id="@item.Id" class="btn btn-outline-primary btn-sm">Edit</a>
                     @if (item.Active)
                     {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Remove from list</button>
+                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Remove from list</button>
                     }
                     else
                     {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Restore to list</button>
+                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Restore to list</button>
                     }
                 </td>
             </tr>

diff --git a/FMS/Pages/Maintenance/FacilityType/Add.cshtml b/FMS/Pages/Maintenance/FacilityType/Add.cshtml
@@ -10,7 +10,7 @@
     ViewData["Title"] = $"Add {MaintenanceOptions.FacilityType}";
 }
 <h1>@ViewData["Title"]</h1>
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="row mb-3">

diff --git a/FMS/Pages/Maintenance/FacilityType/Edit.cshtml b/FMS/Pages/Maintenance/FacilityType/Edit.cshtml
@@ -17,7 +17,7 @@
     }
 </h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <input type="hidden" asp-for="Id" />

diff --git a/FMS/Pages/Maintenance/FacilityType/Index.cshtml b/FMS/Pages/Maintenance/FacilityType/Index.cshtml
@@ -12,35 +12,35 @@
 
 <form method="post">
     <table class="table" aria-label="List of facility types">
-        <thead class="table-light">
-        <tr>
-            <th scope="col">Code</th>
-            <th scope="col">Description</th>
-            <th scope="col">Actions</th>
-        </tr>
+        <thead class="thead-light">
+            <tr>
+                <th scope="col">Code</th>
+                <th scope="col">Description</th>
+                <th scope="col">Actions</th>
+            </tr>
         </thead>
         <tbody>
-        @foreach (var item in Model.FacilityTypes)
-        {
-            <tr class="@(!item.Active ? "table-secondary" : "")">
-                <td class="text-nowrap">
-                    @Html.DisplayFor(m => item.Name, "StringOrNone")
-                    @Html.DisplayFor(m => item.Active, "BoolRemoved")
-                </td>
-                <td>@Html.DisplayFor(m => item.Description, "StringOrNone")</td>
-                <td class="text-nowrap">
-                    <a asp-page="Edit" asp-route-id="@item.Id" class="btn btn-outline-primary btn-sm">Edit</a>
-                    @if (item.Active)
-                    {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Remove from list</button>
-                    }
-                    else
-                    {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Restore to list</button>
-                    }
-                </td>
-            </tr>
-        }
+            @foreach (var item in Model.FacilityTypes)
+            {
+                <tr class="@(!item.Active ? "table-secondary" : "")">
+                    <td class="text-nowrap">
+                        @Html.DisplayFor(m => item.Name, "StringOrNone")
+                        @Html.DisplayFor(m => item.Active, "BoolRemoved")
+                    </td>
+                    <td>@Html.DisplayFor(m => item.Description, "StringOrNone")</td>
+                    <td class="text-nowrap">
+                        <a asp-page="Edit" asp-route-id="@item.Id" class="btn btn-outline-primary btn-sm">Edit</a>
+                        @if (item.Active)
+                        {
+                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Remove from list</button>
+                        }
+                        else
+                        {
+                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Restore to list</button>
+                        }
+                    </td>
+                </tr>
+            }
         </tbody>
     </table>
 </form>
diff --git a/FMS/Pages/Maintenance/OrganizationalUnit/Add.cshtml b/FMS/Pages/Maintenance/OrganizationalUnit/Add.cshtml
@@ -10,7 +10,7 @@
     ViewData["Title"] = $"Add {MaintenanceOptions.OrganizationalUnit}";
 }
 <h1>@ViewData["Title"]</h1>
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="row mb-3">