From 3a4a8ee33b599c5f556359ecd49dd439c09295ba Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 21 Jan 2025 09:48:13 +0800 Subject: [PATCH 1/3] Add `LogoUrl ` and `AppName ` to account layout. Resolve #21941 --- .../Themes/Basic/Layouts/Account.cshtml | 4 ++++ .../wwwroot/themes/basic/logo.svg | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100644 modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/logo.svg diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml index 02adac253b..1e743abf8a 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml @@ -57,6 +57,10 @@
+
+ @BrandingProvider.AppName +

@BrandingProvider.AppName

+
@if (MultiTenancyOptions.Value.IsEnabled && (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true || TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(QueryStringTenantResolveContributor.ContributorName) == true)) diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/logo.svg b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/logo.svg new file mode 100644 index 0000000000..2475fb48d1 --- /dev/null +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/logo.svg @@ -0,0 +1,10 @@ + + + + + + + + + + From 035229d183993ac22d37a6828fa3b6c8991be85f Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 23 Jan 2025 09:40:18 +0800 Subject: [PATCH 2/3] Update brand style --- .../Themes/Basic/Layouts/Account.cshtml | 6 ++--- .../wwwroot/themes/basic/layout.css | 20 +++++++++++++++ .../wwwroot/themes/basic/logo.svg | 25 ++++++++++++------- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml index 1e743abf8a..9a62892b5e 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml @@ -57,9 +57,9 @@
-
- @BrandingProvider.AppName -

@BrandingProvider.AppName

+
+ +

@BrandingProvider.AppName

@if (MultiTenancyOptions.Value.IsEnabled && (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true || diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css index 6054260e2d..7fb233b76a 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css @@ -97,4 +97,24 @@ div.dataTables_wrapper div.dataTables_length label { } .rtl table.dataTable thead th, table.dataTable thead td, table.dataTable tfoot th, table.dataTable tfoot td { text-align: right; +} + +.brand-container{ + text-align: center; + margin-top: 8rem; +} + +.brand-logo { + height: 50px; +} + +.brand-text { + color: #292D33; + font-family: Lexend; + font-size: 30px; + font-style: normal; + font-weight: 500; + line-height: 34px; + margin-top: 5px; + margin-bottom: 15px; } \ No newline at end of file diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/logo.svg b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/logo.svg index 2475fb48d1..b1fb4568f8 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/logo.svg +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/logo.svg @@ -1,10 +1,17 @@ - - - - - - - - - + + + + + + + + + + + + + + + + From a9f43779c5039d06de8b173546588853dbd9ca6c Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 27 Jan 2025 18:41:21 +0800 Subject: [PATCH 3/3] import Google founts. --- .../wwwroot/themes/basic/layout.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css index 7fb233b76a..14aa3186c2 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css @@ -1,4 +1,6 @@ - + +@import url('https://fonts.googleapis.com/css2?family=Lexend:wght@100..900&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap'); + #main-navbar-tools a.dropdown-toggle { text-decoration: none; color: #fff;