From 3150a2433cfaacc7532f9ba9ee2c07409f3db7ba Mon Sep 17 00:00:00 2001
From: Jos Nienhuis <jos_nienhuis@hotmail.com>
Date: Wed, 2 Jun 2021 08:55:10 +0200
Subject: [PATCH] Fixed minor styling problems

---
 RDPMonWebGUI.csproj         | 14 +++-----------
 Views/Home/Index.cshtml     |  4 ++--
 Views/Shared/_Layout.cshtml |  9 +++++++--
 build-post.cmd              |  7 -------
 build-pre.cmd               |  7 -------
 wwwroot/css/site.scss       |  2 +-
 6 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 100644 build-post.cmd
 delete mode 100644 build-pre.cmd

diff --git a/RDPMonWebGUI.csproj b/RDPMonWebGUI.csproj
index 77a5c16..5962bef 100644
--- a/RDPMonWebGUI.csproj
+++ b/RDPMonWebGUI.csproj
@@ -21,11 +21,11 @@
 
   <PropertyGroup>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-    <Version>1.1.0</Version>
+    <Version>1.3.1</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <UserSecretsId>01460183-e12f-43e8-b4bd-1e7a6d188df1</UserSecretsId>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
-    <FileVersion>1.2.0.0</FileVersion>
+    <AssemblyVersion>1.3.1.0</AssemblyVersion>
+    <FileVersion>1.3.1.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -75,12 +75,4 @@
     <Folder Include="wwwroot\lib\bootstrap\" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="build-post.cmd" />
-  </Target>
-
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="build-pre.cmd" />
-  </Target>
-
 </Project>
diff --git a/Views/Home/Index.cshtml b/Views/Home/Index.cshtml
index ea74cd7..e978997 100644
--- a/Views/Home/Index.cshtml
+++ b/Views/Home/Index.cshtml
@@ -28,7 +28,7 @@
 
                     @if (Model.RecordActionButtons.Count != 0)
                     {
-                        <th class="text-right">Actions</th>
+                        <th class="text-end">Actions</th>
                     }
                 </tr>
             </thead>
@@ -44,7 +44,7 @@
 
                         @foreach (RecordActionButton btn in Model.RecordActionButtons)
                         {
-                            <td class="text-right">
+                            <td class="text-end">
                                 <a href="@Url.ActionLink(btn.Action, btn.Controller, new { id = record.Id })" @(string.Join(' ', btn.Attributes)) class="@btn.CssClass"></a>
                             </td>
                         }
diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml
index 770b60c..155fdae 100644
--- a/Views/Shared/_Layout.cshtml
+++ b/Views/Shared/_Layout.cshtml
@@ -16,7 +16,12 @@
         <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
 
         <script defer src="~/lib/jquery/dist/jquery.js" asp-append-version="true"></script>
-        <script defer src="~/lib/bootstrap/dist/js/bootstrap.js" asp-append-version="true"></script>
+        <script defer src="~/lib/bootstrap/js/dist/dom/data.js" asp-append-version="true"></script>
+        <script defer src="~/lib/bootstrap/js/dist/dom/manipulator.js" asp-append-version="true"></script>
+        <script defer src="~/lib/bootstrap/js/dist/dom/selector-engine.js" asp-append-version="true"></script>
+        <script defer src="~/lib/bootstrap/js/dist/dom/event-handler.js" asp-append-version="true"></script>
+        <script defer src="~/lib/bootstrap/js/dist/base-component.js" asp-append-version="true"></script>
+        <script defer src="~/lib/bootstrap/js/dist/collapse.js" asp-append-version="true"></script>
         <script defer src="~/lib/fancybox/jquery.fancybox.js" asp-append-version="true"></script>
         <script defer src="~/js/site.js" asp-append-version="true"></script>
     </environment>
@@ -36,7 +41,7 @@
             <div class="container">
                 <a class="navbar-brand" href="@homeLink">RDPMonWebGUI</a>
 
-                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-content">
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-content">
                     <span class="navbar-toggler-icon"></span>
                 </button>
 
diff --git a/build-post.cmd b/build-post.cmd
deleted file mode 100644
index 02c0573..0000000
--- a/build-post.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-
-if $(ConfigurationName) == Debug (
-	C:\Windows\System32\inetsrv\appcmd.exe start apppool /apppool.name:"RDPMon"
-)
-
-exit 0
\ No newline at end of file
diff --git a/build-pre.cmd b/build-pre.cmd
deleted file mode 100644
index 89cbc55..0000000
--- a/build-pre.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-
-if $(ConfigurationName) == Debug (
-	C:\Windows\System32\inetsrv\appcmd.exe stop apppool /apppool.name:"RDPMon"
-)
-
-exit 0
\ No newline at end of file
diff --git a/wwwroot/css/site.scss b/wwwroot/css/site.scss
index 73be2eb..707437a 100644
--- a/wwwroot/css/site.scss
+++ b/wwwroot/css/site.scss
@@ -19,7 +19,7 @@ $font-family-base: Roboto-Regular, Arial;
 @import "../lib/bootstrap/scss/tables";
 @import "../lib/bootstrap/scss/forms";
 @import "../lib/bootstrap/scss/buttons";
-//@import "../lib/bootstrap/scss/transitions";
+@import "../lib/bootstrap/scss/transitions";
 //@import "../lib/bootstrap/scss/dropdown";
 @import "../lib/bootstrap/scss/button-group";
 @import "../lib/bootstrap/scss/nav";