Browse Source
Merge pull request #11538 from abpframework/auto-merge/rel-5-1/857
Merge branch dev with rel-5.1
pull/11546/head
maliming
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml
|
|
@ -48,7 +48,7 @@ |
|
|
|
|
|
|
|
|
@await Component.InvokeLayoutHookAsync(LayoutHooks.Head.Last, StandardLayouts.Account) |
|
|
@await Component.InvokeLayoutHookAsync(LayoutHooks.Head.Last, StandardLayouts.Account) |
|
|
</head> |
|
|
</head> |
|
|
<body class="abp-account-layout bg-light @rtl"> |
|
|
<body class="abp-account-layout @rtl"> |
|
|
@await Component.InvokeLayoutHookAsync(LayoutHooks.Body.First, StandardLayouts.Account) |
|
|
@await Component.InvokeLayoutHookAsync(LayoutHooks.Body.First, StandardLayouts.Account) |
|
|
|
|
|
|
|
|
@(await Component.InvokeAsync<MainNavbarViewComponent>()) |
|
|
@(await Component.InvokeAsync<MainNavbarViewComponent>()) |
|
|
|
|
|
@ -49,7 +49,7 @@ |
|
|
|
|
|
|
|
|
@await Component.InvokeLayoutHookAsync(LayoutHooks.Head.Last, StandardLayouts.Application) |
|
|
@await Component.InvokeLayoutHookAsync(LayoutHooks.Head.Last, StandardLayouts.Application) |
|
|
</head> |
|
|
</head> |
|
|
<body class="abp-application-layout bg-light @rtl"> |
|
|
<body class="abp-application-layout @rtl"> |
|
|
@await Component.InvokeLayoutHookAsync(LayoutHooks.Body.First, StandardLayouts.Application) |
|
|
@await Component.InvokeLayoutHookAsync(LayoutHooks.Body.First, StandardLayouts.Application) |
|
|
|
|
|
|
|
|
@(await Component.InvokeAsync<MainNavbarViewComponent>()) |
|
|
@(await Component.InvokeAsync<MainNavbarViewComponent>()) |
|
|
|