Browse Source

Smaller fixes on top bar item alignment

pull/6030/head
Mladen Macanovic 6 years ago
parent
commit
47dd6b4a6c
  1. 14
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor
  2. 22
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
  3. 4
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor

14
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor

@ -5,17 +5,17 @@
@inject IJSRuntime JsRuntime @inject IJSRuntime JsRuntime
@if (_otherLanguages != null && _otherLanguages.Any()) @if (_otherLanguages != null && _otherLanguages.Any())
{ {
<Dropdown> <BarDropdown>
<DropdownToggle Color="Color.None"> <BarDropdownToggle>
@_currentLanguage.DisplayName @_currentLanguage.DisplayName
</DropdownToggle> </BarDropdownToggle>
<DropdownMenu> <BarDropdownMenu RightAligned="true">
@foreach (var language in _otherLanguages) @foreach (var language in _otherLanguages)
{ {
<DropdownItem Clicked="() => ChangeLanguageAsync(language)">@language.DisplayName</DropdownItem> <BarDropdownItem Clicked="() => ChangeLanguageAsync(language)">@language.DisplayName</BarDropdownItem>
} }
</DropdownMenu> </BarDropdownMenu>
</Dropdown> </BarDropdown>
} }
@code { @code {
private IReadOnlyList<LanguageInfo> _otherLanguages; private IReadOnlyList<LanguageInfo> _otherLanguages;

22
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor

@ -7,8 +7,8 @@
@inject SignOutSessionStateManager SignOutManager @inject SignOutSessionStateManager SignOutManager
<AuthorizeView> <AuthorizeView>
<Authorized> <Authorized>
<Dropdown> <BarDropdown>
<DropdownToggle Color="Color.None"> <BarDropdownToggle>
@if (CurrentTenant.Name != null) @if (CurrentTenant.Name != null)
{ {
<span><i>@CurrentTenant.Name</i>\@CurrentUser.UserName</span> <span><i>@CurrentTenant.Name</i>\@CurrentUser.UserName</span>
@ -17,25 +17,25 @@
{ {
<span>@CurrentUser.UserName</span> <span>@CurrentUser.UserName</span>
} }
</DropdownToggle> </BarDropdownToggle>
<DropdownMenu> <BarDropdownMenu RightAligned="true">
@if (Menu != null) @if (Menu != null)
{ {
@foreach (var menuItem in Menu.Items) @foreach (var menuItem in Menu.Items)
{ {
<DropdownItem Clicked="@(() => NavigateTo(menuItem.Url))">@menuItem.DisplayName</DropdownItem> <BarDropdownItem Clicked="@(() => NavigateTo(menuItem.Url))">@menuItem.DisplayName</BarDropdownItem>
} }
} }
<a class="dropdown-item" href="@ServerAccountUrl"> <BarDropdownItem To="@ServerAccountUrl">
@UiLocalizer["ManageYourAccount"] @UiLocalizer["ManageYourAccount"]
</a> </BarDropdownItem>
<DropdownDivider /> <DropdownDivider />
<DropdownItem Clicked="BeginSignOut">Logout</DropdownItem> <BarDropdownItem Clicked="BeginSignOut">Logout</BarDropdownItem>
</DropdownMenu> </BarDropdownMenu>
</Dropdown> </BarDropdown>
</Authorized> </Authorized>
<NotAuthorized> <NotAuthorized>
<a class="nav-link" href="authentication/login">Log in</a> <BarLink To="authentication/login">Log in</BarLink>
</NotAuthorized> </NotAuthorized>
</AuthorizeView> </AuthorizeView>
@code{ @code{

4
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor

@ -1,8 +1,8 @@
<ul class="navbar-nav"> <ul class="navbar-nav">
@foreach (var render in ToolbarItemRenders) @foreach (var render in ToolbarItemRenders)
{ {
<li class="nav-item"> <BarItem>
@render @render
</li> </BarItem>
} }
</ul> </ul>

Loading…
Cancel
Save