Browse Source

Migrate new naming schema

pull/11649/head
Mladen Macanovic 5 years ago
parent
commit
966c4499f6
  1. 2
      framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor
  2. 6
      framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
  3. 2
      framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor
  4. 2
      framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor.cs
  5. 4
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleNameComponent.razor

2
framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor

@ -13,7 +13,7 @@
@if (Options.Value.RenderBreadcrumbs && PageLayout.BreadcrumbItems.Any())
{
<Column ColumnSize="ColumnSize.IsAuto.OnWidescreen" Padding="Padding.Is0.FromLeft.OnWidescreen">
<Column ColumnSize="ColumnSize.IsAuto.OnWidescreen" Padding="Padding.Is0.FromStart.OnWidescreen">
<Breadcrumb Mode="@(BreadcrumbShowCurrent ? BreadcrumbMode.Auto : BreadcrumbMode.None)">
@if (BreadcrumbShowHome)
{

6
framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor

@ -22,14 +22,14 @@
<Button Color="Color.Danger" Padding="Padding.Is2.OnX" Clicked="@OnCancelClicked">
@if ( Options?.CancelButtonIcon != null )
{
<Icon Name="@Options.CancelButtonIcon" Margin="Margin.Is2.FromRight" />
<Icon Name="@Options.CancelButtonIcon" Margin="Margin.Is2.FromEnd" />
}
@CancelButtonText
</Button>
<Button Color="Color.Primary" Padding="Padding.Is2.OnX" Clicked="@OnConfirmClicked">
@if ( Options?.ConfirmButtonIcon != null )
{
<Icon Name="@Options.ConfirmButtonIcon" Margin="Margin.Is2.FromRight" />
<Icon Name="@Options.ConfirmButtonIcon" Margin="Margin.Is2.FromEnd" />
}
@ConfirmButtonText
</Button>
@ -39,7 +39,7 @@
<Button Color="Color.Primary" Padding="Padding.Is2.OnX" Clicked="@OnOkClicked">
@if ( Options?.OkButtonIcon != null )
{
<Icon Name="@Options.OkButtonIcon" Margin="Margin.Is2.FromRight" />
<Icon Name="@Options.OkButtonIcon" Margin="Margin.Is2.FromEnd" />
}
@OkButtonText
</Button>

2
framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor

@ -1 +1 @@
<SnackbarStack @ref="SnackbarStack" Location="SnackbarStackLocation.Right" Multiline="true" DelayCloseOnClick="true" DelayCloseOnClickInterval="10000" Closed="@OnSnackbarClosed" />
<SnackbarStack @ref="SnackbarStack" Location="SnackbarStackLocation.End" Multiline="true" DelayCloseOnClick="true" DelayCloseOnClickInterval="10000" Closed="@OnSnackbarClosed" />

2
framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor.cs

@ -36,7 +36,7 @@ public partial class UiNotificationAlert : ComponentBase, IDisposable
UiNotificationType.Success => SnackbarColor.Success,
UiNotificationType.Warning => SnackbarColor.Warning,
UiNotificationType.Error => SnackbarColor.Danger,
_ => SnackbarColor.None,
_ => SnackbarColor.Default,
};
}

4
modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleNameComponent.razor

@ -8,9 +8,9 @@
@(Data.As<IdentityRoleDto>().Name)
@if (Data.As<IdentityRoleDto>().IsDefault)
{
<Badge Color="Color.Success" Margin="Margin.Is1.FromLeft">@L["DisplayName:IsDefault"]</Badge>
<Badge Color="Color.Success" Margin="Margin.Is1.FromStart">@L["DisplayName:IsDefault"]</Badge>
}
@if (Data.As<IdentityRoleDto>().IsPublic)
{
<Badge Color="Color.Info" Margin="Margin.Is1.FromLeft">@L["DisplayName:IsPublic"]</Badge>
<Badge Color="Color.Info" Margin="Margin.Is1.FromStart">@L["DisplayName:IsPublic"]</Badge>
}
Loading…
Cancel
Save