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] 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 e62bc207..9ca3599e 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 d770cc1b..a83e8ffe 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;