Merge pull request #33638 from nextcloud/fix/user-mgmt-avatar-size

Request 64px avatars for the user management
This commit is contained in:
Christoph Wurst 2022-08-22 18:16:21 +02:00 committed by GitHub
commit 7c6c26ba3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 16 deletions

View file

@ -28,8 +28,7 @@
<div :class="{'icon-loading-small': loading.delete || loading.disable || loading.wipe}"
class="avatar">
<img v-if="!loading.delete && !loading.disable && !loading.wipe"
:src="generateAvatar(user.id, 32)"
:srcset="generateAvatar(user.id, 64)+' 2x, '+generateAvatar(user.id, 128)+' 4x'"
:src="generateAvatar(user.id)"
alt=""
height="32"
width="32">
@ -66,8 +65,7 @@
<div :class="{'icon-loading-small': loading.delete || loading.disable || loading.wipe}"
class="avatar">
<img v-if="!loading.delete && !loading.disable && !loading.wipe"
:src="generateAvatar(user.id, 32)"
:srcset="generateAvatar(user.id, 64)+' 2x, '+generateAvatar(user.id, 128)+' 4x'"
:src="generateAvatar(user.id)"
alt=""
height="32"
width="32">

View file

@ -7,8 +7,7 @@
alt=""
width="32"
height="32"
:src="generateAvatar(user.id, 32)"
:srcset="generateAvatar(user.id, 64)+' 2x, '+generateAvatar(user.id, 128)+' 4x'">
:src="generateAvatar(user.id)" />
</div>
<!-- dirty hack to ellipsis on two lines -->
<div class="name">

View file

@ -158,15 +158,13 @@ export default {
* Generate avatar url
*
* @param {string} user The user name
* @param {number} size Size integer, default 32
* @return {string}
*/
generateAvatar(user, size = 32) {
generateAvatar(user) {
return generateUrl(
'/avatar/{user}/{size}?v={version}',
'/avatar/{user}/64?v={version}',
{
user,
size,
version: oc_userconfig.avatar.version,
}
)

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long