Merge pull request #1750 from leigh-pointer/BlazorTheme

Fix for #1736 Blazor theme not rendering correctly
This commit is contained in:
Shaun Walker
2021-11-03 12:32:45 -04:00
committed by GitHub
3 changed files with 18 additions and 14 deletions

View File

@ -1,7 +1,7 @@
@namespace Oqtane.Themes.BlazorTheme @namespace Oqtane.Themes.BlazorTheme
@inherits ContainerBase @inherits ContainerBase
<div class="container"> <div class="container">
<div class="row px-4"> <div class="row p-4">
<div class="d-flex flex-nowrap"> <div class="d-flex flex-nowrap">
<ModuleActions /><h2><ModuleTitle /></h2> <ModuleActions /><h2><ModuleTitle /></h2>
</div> </div>

View File

@ -1,23 +1,26 @@
@namespace Oqtane.Themes.BlazorTheme @namespace Oqtane.Themes.BlazorTheme
@inherits ThemeBase @inherits ThemeBase
<div class="breadcrumbs"> <div class="breadcrumbs">
<Breadcrumbs /> <Breadcrumbs />
</div> </div>
<div class="sidebar"> <div class="row flex-xl-nowrap gx-0">
<nav class="navbar"> <div class="sidebar">
<Logo /><Menu Orientation="Vertical" /> <nav class="navbar">
</nav> <Logo /><Menu Orientation="Vertical" />
</div> </nav>
<div class="main">
<div class="top-row px-4">
<div class="ms-auto"><UserProfile /> <Login /> <ControlPanel /></div>
</div> </div>
<div class="container">
<div class="row px-4"> <div class="main g-0">
<Pane Name="@PaneNames.Admin" /> <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>
</div> </div>

View File

@ -124,6 +124,7 @@
@media (min-width: 768px) { @media (min-width: 768px) {
app { app {
flex-direction: row; flex-direction: row;
display: block;
} }
.app-logo { .app-logo {