From 13b45453c677c8171e5eb1dc261b772a3e7137fc Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@outlook.com>
Date: Fri, 5 Mar 2021 15:31:38 +0100
Subject: [PATCH 1/3] Fixed Issue with menu Icon Spacing. #1160

---
 Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor b/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
index 840fbf4e..d5397e11 100644
--- a/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
+++ b/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
@@ -8,14 +8,14 @@
         {
             if (childPage.PageId == PageState.Page.PageId)
             {
-                <a class="dropdown-item active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                <a class="nav-link active px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
                     <FontIcon Value="@childPage.Icon" />
                     @childPage.Name <span class="sr-only">(current)</span>
                 </a>
             }
             else
             {
-                <a class="dropdown-item" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                <a class="nav-link px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
                     <FontIcon Value="@childPage.Icon" />
                     @childPage.Name
                 </a>

From 3ff1dc4a21bd1be261c5922c39d24c1c214034b5 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@outlook.com>
Date: Tue, 9 Mar 2021 17:16:25 +0100
Subject: [PATCH 2/3] MenuItems updated with HTML markup in place of the
 FontIcon component

---
 .../Themes/Controls/MenuItemsHorizontal.razor      | 14 +++++++-------
 .../Themes/Controls/MenuItemsVertical.razor        |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor b/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
index d5397e11..5e75738b 100644
--- a/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
+++ b/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
@@ -9,14 +9,14 @@
             if (childPage.PageId == PageState.Page.PageId)
             {
                 <a class="nav-link active px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                    <FontIcon Value="@childPage.Icon" />
-                    @childPage.Name <span class="sr-only">(current)</span>
+                        <span class="@childPage.Icon" aria-hidden="true" />
+                        @childPage.Name <span class="sr-only">(current)</span>
                 </a>
             }
             else
             {
                 <a class="nav-link px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                    <FontIcon Value="@childPage.Icon" />
+                    <span class="@childPage.Icon" aria-hidden="true" />
                     @childPage.Name
                 </a>
             }
@@ -34,7 +34,7 @@ else
                 {
                     <li class="nav-item active">
                         <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                            <FontIcon Value="@childPage.Icon" />
+                            <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name <span class="sr-only">(current)</span>
                         </a>
                     </li>
@@ -43,7 +43,7 @@ else
                 {
                     <li class="nav-item">
                         <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                            <FontIcon Value="@childPage.Icon" />
+                            <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name
                         </a>
                     </li>
@@ -55,7 +55,7 @@ else
                 {
                     <li class="nav-item dropdown active">
                         <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <FontIcon Value="@childPage.Icon" />
+                            <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name <span class="sr-only">(current)</span>
                         </a>
                         <MenuItemsHorizontal ParentPage="childPage" Pages="Pages" />
@@ -65,7 +65,7 @@ else
                 {
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <FontIcon Value="@childPage.Icon" />
+                            <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name
                         </a>
                         <MenuItemsHorizontal ParentPage="childPage" Pages="Pages" />
diff --git a/Oqtane.Client/Themes/Controls/MenuItemsVertical.razor b/Oqtane.Client/Themes/Controls/MenuItemsVertical.razor
index a27f9a7a..2f314ca0 100644
--- a/Oqtane.Client/Themes/Controls/MenuItemsVertical.razor
+++ b/Oqtane.Client/Themes/Controls/MenuItemsVertical.razor
@@ -9,7 +9,7 @@
         {
             <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                 <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                    <FontIcon Value="@childPage.Icon" />
+                    <span class="@childPage.Icon" aria-hidden="true" />
                     @childPage.Name <span class="sr-only">(current)</span>
                 </a>
             </li>
@@ -18,7 +18,7 @@
         {
             <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                 <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                    <FontIcon Value="@childPage.Icon" />
+                    <span class="@childPage.Icon" aria-hidden="true" />
                     @childPage.Name
                 </a>
             </li>
@@ -38,7 +38,7 @@ else
             {
                 <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                     <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                        <FontIcon Value="@childPage.Icon" />
+                        <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name <span class="sr-only">(current)</span>
                     </a>
                 </li>
@@ -47,7 +47,7 @@ else
             {
                 <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                     <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                        <FontIcon Value="@childPage.Icon" />
+                        <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name
                     </a>
                 </li>

From b58c7386b3a9113b4da8c344a0f213a650f75574 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@outlook.com>
Date: Wed, 10 Mar 2021 17:00:49 +0100
Subject: [PATCH 3/3] Fixed issue Event Log strange behavior with the Paging
 control #1158

---
 Oqtane.Client/Modules/Admin/Logs/Index.razor | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 070e3fdf..64403d74 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -48,7 +48,7 @@ else
 
     @if (_logs.Any())
     {
-        <Pager Items="@_logs">
+        <Pager TableItem="Log" Items="@_logs">
             <Header>
                 <th style="width: 1px;">&nbsp;</th>
                 <th>@Localizer["Date"]</th>
@@ -141,6 +141,10 @@ else
     private async Task GetLogs()
     {
         _logs = await LogService.GetLogsAsync(PageState.Site.SiteId, ((_level == "-") ? string.Empty : _level), ((_function == "-") ? string.Empty : _function), int.Parse(_rows));
+        await InvokeAsync(() =>
+        {
+            base.StateHasChanged();
+        });
     }
 
     private string GetClass(string function)