Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for #1736 Blazor theme not rendering correctly #1750

Merged
merged 3 commits into from
Nov 3, 2021
Merged

Fix for #1736 Blazor theme not rendering correctly #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9752c72
Fix for #1736 Blazor theme not rendering correctly
leigh-pointer Oct 28, 2021
1659de3
Fix for #1736 Server Css
leigh-pointer Oct 28, 2021
6d8df26
modification for responsive theme
leigh-pointer Oct 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
27 changes: 15 additions & 12 deletions Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
@namespace Oqtane.Themes.BlazorTheme
@inherits ThemeBase


<div class="breadcrumbs">
<Breadcrumbs />
</div>

<div class="sidebar">
<nav class="navbar">
<Logo /><Menu Orientation="Vertical" />
</nav>
</div>

<div class="main">
<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">
<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>
Expand Down
1 change: 1 addition & 0 deletions Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
@media (min-width: 768px) {
app {
flex-direction: row;
display: block;
}

.app-logo {
Expand Down