Merge pull request #22842 from abpframework/auto-merge/rel-9-2/3714

maliming · web-flow · commit a47250053095 · 2025-05-05T14:34:54.000+08:00
Merge branch dev with rel-9.2
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
@@ -35,6 +35,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
+	  <link rel="icon" href="~/themes/basic/favicon.svg" type="image/svg+xml">
     @if (!ThemingOptions.Value.BaseUrl.IsNullOrWhiteSpace())
     {
         <base href="@ThemingOptions.Value.BaseUrl" />
diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml
@@ -44,6 +44,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <link rel="icon" href="~/themes/basic/favicon.svg" type="image/svg+xml">
     @if (!ThemingOptions.Value.BaseUrl.IsNullOrWhiteSpace())
     {
         <base href="@ThemingOptions.Value.BaseUrl" />
diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Empty.cshtml b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Empty.cshtml
@@ -42,6 +42,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <link rel="icon" href="~/themes/basic/favicon.svg" type="image/svg+xml">
     @if (!ThemingOptions.Value.BaseUrl.IsNullOrWhiteSpace())
     {
         <base href="@ThemingOptions.Value.BaseUrl" />
diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/favicon.svg b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/favicon.svg
@@ -0,0 +1,8 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="32" height="32" rx="16" fill="white"/>
+<path d="M15.992 18.3178C17.3478 18.3178 18.4469 17.2185 18.4469 15.8625C18.4469 14.5065 17.3478 13.4072 15.992 13.4072C14.6362 13.4072 13.5371 14.5065 13.5371 15.8625C13.5371 17.2185 14.6362 18.3178 15.992 18.3178Z" fill="#B84297"/>
+<path d="M15.9927 1.2793C13.7624 1.27721 11.5609 1.78361 9.55566 2.76004V5.92222C11.3423 4.78147 13.3998 4.13577 15.5178 4.05116C17.6358 3.96654 19.7382 4.44605 21.6101 5.44063C23.4821 6.43521 25.0563 7.90919 26.1718 9.71183C27.2874 11.5145 27.9042 13.5811 27.9592 15.7004V24.5949C29.5383 22.3938 30.4798 19.7998 30.6802 17.0982C30.8806 14.3967 30.3322 11.6921 29.0952 9.28208C27.8583 6.87205 25.9808 4.84987 23.6691 3.43797C21.3575 2.02607 18.7013 1.27913 15.9927 1.2793Z" fill="#292D33"/>
+<path d="M15.9921 27.9751C12.9178 27.975 9.96149 26.7912 7.73664 24.6692C5.51179 22.5472 4.18917 19.65 4.0432 16.5787H4.02932V7.42285C1.87797 10.4299 0.936271 14.1363 1.3913 17.8058C1.84633 21.4753 3.66478 24.8393 6.48543 27.2297C9.30609 29.62 12.9225 30.8618 16.6164 30.7082C20.3103 30.5547 23.8112 29.0171 26.4239 26.401V21.8692C25.3838 23.7217 23.8692 25.2638 22.0358 26.3369C20.2024 27.41 18.1164 27.9755 15.9921 27.9751Z" fill="#292D33"/>
+<path d="M15.9919 19.7782C15.1024 19.779 14.2384 19.4811 13.5382 18.9324V21.7474C14.8146 22.2725 16.2259 22.3734 17.5639 22.0352C18.902 21.697 20.0959 20.9377 20.9696 19.8692C21.8433 18.8007 22.3506 17.4797 22.4165 16.101C22.4824 14.7222 22.1036 13.3588 21.3358 12.2118C20.568 11.0649 19.4519 10.195 18.1523 9.73069C16.8526 9.26635 15.4381 9.23207 14.1175 9.63291C12.7969 10.0338 11.64 10.8485 10.8176 11.9569C9.99518 13.0654 9.55072 14.4089 9.5498 15.7892V24.0664C10.2982 24.6557 11.1238 25.1399 12.0034 25.5054V15.7854C12.0034 14.9964 12.2374 14.2252 12.6756 13.5692C13.1139 12.9132 13.7368 12.4019 14.4656 12.1C15.1944 11.7981 15.9963 11.7191 16.77 11.873C17.5437 12.0269 18.2543 12.4068 18.8121 12.9647C19.3699 13.5226 19.7498 14.2334 19.9037 15.0072C20.0576 15.7809 19.9786 16.583 19.6767 17.3119C19.3748 18.0408 18.8636 18.6638 18.2077 19.1021C17.5518 19.5404 16.7807 19.7744 15.9919 19.7744V19.7782Z" fill="#292D33"/>
+<path d="M8.01729 22.5839V15.8619C8.01806 14.1786 8.5514 12.5388 9.54092 11.1772C10.5304 9.81559 11.9254 8.80208 13.526 8.28181C15.1266 7.76153 16.8508 7.76118 18.4516 8.28079C20.0524 8.80041 21.4478 9.81334 22.4379 11.1745C23.428 12.5357 23.962 14.1754 23.9634 15.8586C23.9649 17.5419 23.4338 19.1825 22.4461 20.5454C21.4584 21.9083 20.0648 22.9237 18.4648 23.4461C16.8649 23.9685 15.1408 23.9711 13.5392 23.4537V26.0036C15.3452 26.4409 17.2351 26.3879 19.0136 25.85C20.7922 25.3121 22.3948 24.3089 23.6558 22.944C24.9168 21.5791 25.7905 19.9021 26.1864 18.0864C26.5823 16.2707 26.4861 14.3822 25.9078 12.6162C25.3296 10.8501 24.2901 9.27057 22.897 8.04087C21.5039 6.81117 19.8076 5.97593 17.9836 5.62152C16.1597 5.26711 14.2741 5.40637 12.522 6.02493C10.7698 6.64348 9.21467 7.71887 8.01729 9.13991V5.73157V3.62598C7.12906 4.198 6.30478 4.8637 5.55859 5.61165V16.175C5.62823 18.5282 6.49517 20.788 8.01729 22.5839V22.5839Z" fill="#292D33"/>
+</svg>

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`<meta charset="utf-8">`
`36`	`36`	`<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">`
`37`	`37`	`<meta http-equiv="X-UA-Compatible" content="ie=edge">`
	`38`	`+ <link rel="icon" href="~/themes/basic/favicon.svg" type="image/svg+xml">`
`38`	`39`	`@if (!ThemingOptions.Value.BaseUrl.IsNullOrWhiteSpace())`
`39`	`40`	`{`
`40`	`41`	`<base href="@ThemingOptions.Value.BaseUrl" />`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@`
`44`	`44`	`<meta charset="utf-8">`
`45`	`45`	`<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">`
`46`	`46`	`<meta http-equiv="X-UA-Compatible" content="ie=edge">`
	`47`	`+ <link rel="icon" href="~/themes/basic/favicon.svg" type="image/svg+xml">`
`47`	`48`	`@if (!ThemingOptions.Value.BaseUrl.IsNullOrWhiteSpace())`
`48`	`49`	`{`
`49`	`50`	`<base href="@ThemingOptions.Value.BaseUrl" />`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@`
`42`	`42`	`<meta charset="utf-8">`
`43`	`43`	`<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">`
`44`	`44`	`<meta http-equiv="X-UA-Compatible" content="ie=edge">`
	`45`	`+ <link rel="icon" href="~/themes/basic/favicon.svg" type="image/svg+xml">`
`45`	`46`	`@if (!ThemingOptions.Value.BaseUrl.IsNullOrWhiteSpace())`
`46`	`47`	`{`
`47`	`48`	`<base href="@ThemingOptions.Value.BaseUrl" />`