From 9752c72998df80f90df747b38be7e0452bbc8a52 Mon Sep 17 00:00:00 2001
From: Leigh <Leigh.Pointer@outlook.com>
Date: Thu, 28 Oct 2021 19:43:51 +0200
Subject: [PATCH 1/3] Fix for #1736 Blazor theme not rendering correctly

Fix to the Default theme and container
---
 .../Themes/BlazorTheme/Containers/Container.razor          | 4 ++--
 Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor      | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor b/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor
index e62bc207e..9ca3599e1 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor
@@ -1,7 +1,7 @@
-@namespace Oqtane.Themes.BlazorTheme
+@namespace Oqtane.Themes.BlazorTheme
 @inherits ContainerBase
 <div class="container">
-    <div class="row px-4">
+    <div class="row p-4">
         <div class="d-flex flex-nowrap">
             <ModuleActions /><h2><ModuleTitle /></h2>
         </div>
diff --git a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
index d770cc1b0..a83e8ffe5 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
@@ -5,23 +5,24 @@
     <Breadcrumbs />
 </div>
 
+<div class="row flex-xl-nowrap">
 <div class="sidebar">
     <nav class="navbar">
         <Logo /><Menu Orientation="Vertical" />
     </nav>
 </div>
 
-<div class="main">
+<div class="main g-0">
     <div class="top-row px-4">
         <div class="ms-auto"><UserProfile /> <Login /> <ControlPanel /></div>
     </div>
-    <div class="container">
+    <div class="container-fluid">
         <div class="row px-4">
             <Pane Name="@PaneNames.Admin" />
         </div>
     </div>
 </div>
-
+</div>
 @code {
     public override string Panes => PaneNames.Admin;
 

From 1659de3a2b44ecc306d11037c1ffc0950a773574 Mon Sep 17 00:00:00 2001
From: Leigh <Leigh.Pointer@outlook.com>
Date: Thu, 28 Oct 2021 20:35:48 +0200
Subject: [PATCH 2/3] Fix for #1736 Server Css

Update to the Server file Theme.css
---
 Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
index a73e6b334..668d7fd37 100644
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
+++ b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
@@ -124,6 +124,7 @@
 @media (min-width: 768px) {
     app {
         flex-direction: row;
+        display: block;
     }
 
     .app-logo {

From 6d8df2661c0fd70d7eb01175a2d57497e43be9d3 Mon Sep 17 00:00:00 2001
From: Leigh <Leigh.Pointer@outlook.com>
Date: Sun, 31 Oct 2021 07:08:19 +0100
Subject: [PATCH 3/3] modification for responsive theme

small modification to ensure theme is responsive
---
 .../Themes/BlazorTheme/Themes/Default.razor   | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
index a83e8ffe5..bc60e72f2 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
@@ -1,28 +1,30 @@
 @namespace Oqtane.Themes.BlazorTheme
 @inherits ThemeBase
 
+
 <div class="breadcrumbs">
     <Breadcrumbs />
 </div>
 
-<div class="row flex-xl-nowrap">
-<div class="sidebar">
-    <nav class="navbar">
-        <Logo /><Menu Orientation="Vertical" />
-    </nav>
-</div>
-
-<div class="main g-0">
-    <div class="top-row px-4">
-        <div class="ms-auto"><UserProfile /> <Login /> <ControlPanel /></div>
+<div class="row flex-xl-nowrap gx-0">
+    <div class="sidebar">
+        <nav class="navbar">
+            <Logo /><Menu Orientation="Vertical" />
+        </nav>
     </div>
-    <div class="container-fluid">
-        <div class="row px-4">
-            <Pane Name="@PaneNames.Admin" />
+
+    <div class="main g-0">
+        <div class="top-row px-4">
+            <div class="ms-auto"><UserProfile /> <Login /> <ControlPanel /></div>
+        </div>
+        <div class="container">
+            <div class="row px-4">
+                <Pane Name="@PaneNames.Admin" />
+            </div>
         </div>
     </div>
 </div>
-</div>
+
 @code {
     public override string Panes => PaneNames.Admin;