kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1163 from leigh-pointer/dev

Browse Source 
Issue with menu Icon Spacing. #1160
This commit is contained in:
Shaun Walker 2021-03-10 17:00:08 -05:00 committed by GitHub
commit 6bde83fab1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Oqtane.Client/Modules/Admin/Logs/Index.razor
View File

@ -48,7 +48,7 @@ else
@if (_logs.Any()) @if (_logs.Any())
{ {
<Pager Items="@_logs"> <Pager TableItem="Log" Items="@_logs">
<Header> <Header>
<th style="width: 1px;">&nbsp;</th> <th style="width: 1px;">&nbsp;</th>
<th>@Localizer["Date"]</th> <th>@Localizer["Date"]</th>
@ -141,6 +141,10 @@ else
private async Task GetLogs() private async Task GetLogs()
{ {
_logs = await LogService.GetLogsAsync(PageState.Site.SiteId, ((_level == "-") ? string.Empty : _level), ((_function == "-") ? string.Empty : _function), int.Parse(_rows)); _logs = await LogService.GetLogsAsync(PageState.Site.SiteId, ((_level == "-") ? string.Empty : _level), ((_function == "-") ? string.Empty : _function), int.Parse(_rows));
await InvokeAsync(() =>
{
base.StateHasChanged();
});
} }
private string GetClass(string function) private string GetClass(string function)

16
Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
View File

@ -8,15 +8,15 @@
{ {
if (childPage.PageId == PageState.Page.PageId) if (childPage.PageId == PageState.Page.PageId)
{ {
<a class="dropdown-item active" href="@GetUrl(childPage)" target="@GetTarget(childPage)"> <a class="nav-link active px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
<FontIcon Value="@childPage.Icon" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name <span class="sr-only">(current)</span> @childPage.Name <span class="sr-only">(current)</span>
</a> </a>
} }
else else
{ {
<a class="dropdown-item" href="@GetUrl(childPage)" target="@GetTarget(childPage)"> <a class="nav-link px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
<FontIcon Value="@childPage.Icon" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name @childPage.Name
</a> </a>
} }
@ -34,7 +34,7 @@ else
{ {
<li class="nav-item active"> <li class="nav-item active">
<a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)"> <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
<FontIcon Value="@childPage.Icon" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name <span class="sr-only">(current)</span> @childPage.Name <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
@ -43,7 +43,7 @@ else
{ {
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)"> <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
<FontIcon Value="@childPage.Icon" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name @childPage.Name
</a> </a>
</li> </li>
@ -55,7 +55,7 @@ else
{ {
<li class="nav-item dropdown active"> <li class="nav-item dropdown active">
<a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<FontIcon Value="@childPage.Icon" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name <span class="sr-only">(current)</span> @childPage.Name <span class="sr-only">(current)</span>
</a> </a>
<MenuItemsHorizontal ParentPage="childPage" Pages="Pages" /> <MenuItemsHorizontal ParentPage="childPage" Pages="Pages" />
@ -65,7 +65,7 @@ else
{ {
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<FontIcon Value="@childPage.Icon" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name @childPage.Name
</a> </a>
<MenuItemsHorizontal ParentPage="childPage" Pages="Pages" /> <MenuItemsHorizontal ParentPage="childPage" Pages="Pages" />

8
Oqtane.Client/Themes/Controls/MenuItemsVertical.razor
View File

@ -9,7 +9,7 @@
{ {
<li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;"> <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
<a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)"> <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
<FontIcon Value="@childPage.Icon" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name <span class="sr-only">(current)</span> @childPage.Name <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
@ -18,7 +18,7 @@
{ {
<li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;"> <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
<a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)"> <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
<FontIcon Value="@childPage.Icon" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name @childPage.Name
</a> </a>
</li> </li>
@ -38,7 +38,7 @@ else
{ {
<li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;"> <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
<a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)"> <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
<FontIcon Value="@childPage.Icon" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name <span class="sr-only">(current)</span> @childPage.Name <span class="sr-only">(current)</span>
</a> </a>
</li> </li>
@ -47,7 +47,7 @@ else
{ {
<li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;"> <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
<a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)"> <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
<FontIcon Value="@childPage.Icon" /> <span class="@childPage.Icon" aria-hidden="true" />
@childPage.Name @childPage.Name
</a> </a>
</li> </li>