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

fix avatar sizes

Browse Source
This commit is contained in:
Mads Rasmussen
2017-06-14 14:07:07 +02:00
parent 12de575dfb
commit 898f00cbf1
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Core/Models/UserExtensions.cs
View File

@@ -69,11 +69,11 @@ namespace Umbraco.Core.Models
{
return new[]
{
gravatarUrl + "?s=30",
gravatarUrl + "?s=60",
gravatarUrl + "?s=90",
gravatarUrl + "?s=150",
gravatarUrl + "?s=300"
gravatarUrl + "&s=30",
gravatarUrl + "&s=60",
gravatarUrl + "&s=90",
gravatarUrl + "&s=150",
gravatarUrl + "&s=300"
};
}

2
src/Umbraco.Web.UI.Client/src/common/directives/components/users/umbuserpreview.directive.js
View File

@@ -12,7 +12,7 @@
replace: true,
templateUrl: 'views/components/users/umb-user-preview.html',
scope: {
avatar: "=?",
avatars: "=?",
name: "=",
allowRemove: "=?",
onRemove: "&?"

3
src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html
View File

@@ -5,7 +5,8 @@
size="xs"
color="secondary"
name="{{name}}"
img-src="{{avatar}}">
img-src="{{avatars[0]}}"
img-srcset="{{avatars[1]}} 2x, {{avatars[2]}} 3x">
</umb-avatar>
</div>

2
src/Umbraco.Web.UI.Client/src/views/users/group.html
View File

@@ -108,7 +108,7 @@
<umb-user-preview
ng-repeat="user in vm.userGroup.users"
name="user.name"
avatar="user.avatar"
avatars="user.avatars"
allow-remove="true"
on-remove="vm.removeSelectedUser($index, vm.userGroup.users)">
</umb-user-preview>

3
src/Umbraco.Web.UI.Client/src/views/users/user.html
View File

@@ -126,7 +126,8 @@
color="secondary"
size="xxl"
name="{{vm.user.name}}"
img-src="{{vm.user.avatars[4]}}">
img-src="{{vm.user.avatars[3]}}"
img-srcset="{{vm.user.avatars[4]}} 2x, {{vm.user.avatars[4]}} 3x">
</umb-avatar>
<umb-progress-bar

6
src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
View File

@@ -181,7 +181,8 @@
size="l"
color="secondary"
name="{{user.name}}"
img-src="{{user.avatars[2]}}">
img-src="{{user.avatars[2]}}"
img-srcset="{{user.avatars[3]}} 2x, {{user.avatars[4]}} 3x">
</umb-avatar>
</div>
<div class="umb-user__checkmark" ng-if="user.selected"><umb-checkmark checked="user.selected" size="s"></umb-checkmark></div>
@@ -232,7 +233,8 @@
size="xs"
color="secondary"
name="{{user.name}}"
img-src="{{user.avatars[0]}}">
img-src="{{user.avatars[0]}}"
img-srcset="{{user.avatars[1]}} 2x, {{user.avatars[2]}} 3x">
</umb-avatar>
</td>
<td class="bold"><a href="" ng-click="vm.goToUser(user)">{{user.name}}</a></td>