yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ordering of css files and set correct defautl icon for external providers.

Browse Source
This commit is contained in:
Shannon
2021-07-26 11:10:37 -06:00
parent 4759bcac69
commit c8d36cfc4f
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
View File

@@ -55,15 +55,17 @@ namespace Umbraco.Cms.Infrastructure.WebAssets
_runtimeMinifier.CreateCssBundle(UmbracoInitCssBundleName,
BundlingOptions.NotOptimizedAndComposite,
FormatPaths("lib/bootstrap-social/bootstrap-social.css",
"assets/css/umbraco.min.css",
"lib/font-awesome/css/font-awesome.min.css"));
FormatPaths(
"assets/css/umbraco.min.css",
"lib/bootstrap-social/bootstrap-social.css",
"lib/font-awesome/css/font-awesome.min.css"));
_runtimeMinifier.CreateCssBundle(UmbracoUpgradeCssBundleName,
BundlingOptions.NotOptimizedAndComposite,
FormatPaths("assets/css/umbraco.min.css",
"lib/bootstrap-social/bootstrap-social.css",
"lib/font-awesome/css/font-awesome.min.css"));
FormatPaths(
"assets/css/umbraco.min.css",
"lib/bootstrap-social/bootstrap-social.css",
"lib/font-awesome/css/font-awesome.min.css"));
_runtimeMinifier.CreateCssBundle(UmbracoPreviewCssBundleName,
BundlingOptions.NotOptimizedAndComposite,

2
src/Umbraco.Web.BackOffice/Security/BackOfficeExternalLoginProviderOptions.cs
View File

@@ -27,7 +27,7 @@ namespace Umbraco.Cms.Web.BackOffice.Security
public string ButtonStyle { get; set; } = "btn-openid";
public string Icon { get; set; } = "fa-user";
public string Icon { get; set; } = "fa fa-user";
/// <summary>
/// Options used to control how users can be auto-linked/created/updated based on the external login provider