Skip to content

Change the property accessed on the external provider from SocialIcon to Icon. #10675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Shazwazza merged 6 commits into from
Jul 26, 2021
Merged

Change the property accessed on the external provider from SocialIcon to Icon. #10675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d045003
add userId to IX_ExternalLogin_LoginProvider
cleversolutions Jul 13, 2021
d4760f5
include userId in IX_umbracoExternalLogin_LoginProvider
recyclethis Jul 13, 2021
0c12549
Fix External Login Providers using wrong property for icon
recyclethis Jul 14, 2021
acda770
Remove changes from temp-10656
recyclethis Jul 14, 2021
ef4621e
Login screen replace i tag with umb-icon directive
recyclethis Jul 14, 2021
8e20b7f
Fix broken icon on user overlay
recyclethis Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h5>
ng-class="login.properties.ButtonStyle"
id="{{login.authType}}">

<i class="fa" ng-class="login.properties.SocialIcon"></i>
<umb-icon icon="{{login.properties.Icon}}" class="{{login.properties.Icon}}" style="height:100%;"></umb-icon>
<localize key="defaultdialogs_linkYour">Link your</localize>&nbsp;{{login.caption}}&nbsp;<localize key="defaultdialogs_account">account</localize>
</button>
</form>
Expand Down
16 changes: 8 additions & 8 deletions src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,14 @@ <h1>{{greeting}}</h1>

<div ng-if="!login.customView">
<form method="POST" action="{{vm.externalLoginFormAction}}">
<button type="submit"
class="btn btn-block btn-social"
ng-class="login.properties.ButtonStyle"
id="{{login.authType}}" name="provider" value="{{login.authType}}"
title="Log in using your {{login.caption}} account">
<i class="fa" ng-class="login.properties.SocialIcon"></i>
<localize key="login_signInWith">Sign in with</localize>&nbsp;{{login.caption}}
</button>
<button type="submit"
class="btn btn-block btn-social"
ng-class="login.properties.ButtonStyle"
id="{{login.authType}}" name="provider" value="{{login.authType}}"
title="Log in using your {{login.caption}} account">
<umb-icon icon="{{login.properties.Icon}}" class="{{login.properties.Icon}}" style="height:100%;"></umb-icon>
<localize key="login_signInWith">Sign in with</localize>&nbsp;{{login.caption}}
</button>
</form>
<div ng-if="login.errors">
<div class="text-error" ng-repeat="error in login.errors">
Expand Down