From 4b7543d8c487a4c3496f4ffddfa77bfdbd3e42d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 17 Mar 2021 20:44:19 +0300 Subject: [PATCH] separate blazor and mvc styles. --- .../MyProjectNameBlazorModule.cs | 7 +++++-- .../wwwroot/blazor-global-styles.css | 18 ++++++++++++++++ .../wwwroot/global-styles.css | 21 +++---------------- 3 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/blazor-global-styles.css diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs index ef18aabbc1..0a381b889b 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs @@ -16,6 +16,7 @@ using Volo.Abp; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Authentication.JwtBearer; using Volo.Abp.AspNetCore.Components.Server.BasicTheme; +using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling; using Volo.Abp.AspNetCore.Components.Server.Theming.Bundling; using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; using Volo.Abp.AspNetCore.Mvc; @@ -105,6 +106,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server { Configure(options => { + // MVC UI options.StyleBundles.Configure( BasicThemeBundles.Styles.Global, bundle => @@ -113,11 +115,12 @@ namespace MyCompanyName.MyProjectName.Blazor.Server } ); + //BLAZOR UI options.StyleBundles.Configure( - BlazorStandardBundles.Styles.Global, + BlazorBasicThemeBundles.Styles.Global, bundle => { - bundle.AddFiles("/global-styles.css"); + bundle.AddFiles("/blazor-global-styles.css"); } ); }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/blazor-global-styles.css b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/blazor-global-styles.css new file mode 100644 index 0000000000..4f895ce71e --- /dev/null +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/blazor-global-styles.css @@ -0,0 +1,18 @@ +#blazor-error-ui { + background: lightyellow; + bottom: 0; + box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); + display: none; + left: 0; + padding: 0.6rem 1.25rem 0.7rem 1.25rem; + position: fixed; + width: 100%; + z-index: 1000; +} + +#blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; +} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/global-styles.css b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/global-styles.css index 4f895ce71e..b248b67c1b 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/global-styles.css +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/global-styles.css @@ -1,18 +1,3 @@ -#blazor-error-ui { - background: lightyellow; - bottom: 0; - box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); - display: none; - left: 0; - padding: 0.6rem 1.25rem 0.7rem 1.25rem; - position: fixed; - width: 100%; - z-index: 1000; -} - -#blazor-error-ui .dismiss { - cursor: pointer; - position: absolute; - right: 0.75rem; - top: 0.5rem; -} +body { + +} \ No newline at end of file