Merge branch 'master' into ComponentRefactoring

This commit is contained in:
Shaun Walker
2020-04-27 14:25:09 -04:00
committed by GitHub
3 changed files with 71 additions and 8 deletions

View File

@ -1,14 +1,27 @@
@namespace Oqtane.Themes.BlazorTheme
@inherits ThemeBase
<div class="breadcrumbs">
<Breadcrumbs />
</div>
<div class="sidebar">
<div align="center"><Logo /></div>
<Menu Orientation="Vertical" />
<nav class="navbar">
<Logo />
<button class="navbar-toggler" aria-expanded="false" aria-controls="navbarSupportedContent"
aria-label="Toggle navigation" type="button" data-toggle="collapse"
data-target="#navbarSupportedContent">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<Menu Orientation="Vertical" />
</div>
</nav>
</div>
<div class="main">
<div class="top-row px-4">
<Breadcrumbs /> <div class="ml-md-auto"><UserProfile /> <Login /> <ControlPanel /></div>
<div class="ml-md-auto"><UserProfile /> <Login /> <ControlPanel /></div>
</div>
<div class="container">
<div class="row px-4">

View File

@ -5,7 +5,7 @@
@if (PageState.Site.LogoFileId != null)
{
<a href="@Href">
<img src="@ContentUrl(PageState.Site.LogoFileId.Value)" alt="@PageState.Site.Name"/>
<img class="img-fluid" src="@ContentUrl(PageState.Site.LogoFileId.Value)" alt="@PageState.Site.Name"/>
</a>
}