IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

changed avatar tokens not to be so custom

Browse Source
This commit is contained in:
Matthew Birtch 2024-03-18 17:32:13 -04:00
parent 8a779b3e5f
commit 700f172f0d
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/channels/src/components/admin_console/admin_user_card/__snapshots__/admin_user_card.test.tsx.snap
View File

@ -19,7 +19,7 @@ exports[`components/admin_console/admin_user_card/admin_user_card should match d
> >
<img <img
alt="user profile image" alt="user profile image"
class="Avatar Avatar-xxl" class="Avatar Avatar-xxxxl"
loading="lazy" loading="lazy"
src="/api/v4/users/1234/image" src="/api/v4/users/1234/image"
tabindex="-1" tabindex="-1"
@ -79,7 +79,7 @@ exports[`components/admin_console/admin_user_card/admin_user_card should match s
> >
<img <img
alt="user profile image" alt="user profile image"
class="Avatar Avatar-xxl" class="Avatar Avatar-xxxxl"
loading="lazy" loading="lazy"
src="/api/v4/users/1234/image" src="/api/v4/users/1234/image"
tabindex="-1" tabindex="-1"
@ -134,7 +134,7 @@ exports[`components/admin_console/admin_user_card/admin_user_card should match s
> >
<img <img
alt="user profile image" alt="user profile image"
class="Avatar Avatar-xxl" class="Avatar Avatar-xxxxl"
loading="lazy" loading="lazy"
src="/api/v4/users/1234/image" src="/api/v4/users/1234/image"
tabindex="-1" tabindex="-1"
@ -187,7 +187,7 @@ exports[`components/admin_console/admin_user_card/admin_user_card should match s
> >
<img <img
alt="user profile image" alt="user profile image"
class="Avatar Avatar-xxl" class="Avatar Avatar-xxxxl"
loading="lazy" loading="lazy"
src="/api/v4/users/1234/image" src="/api/v4/users/1234/image"
tabindex="-1" tabindex="-1"

2
webapp/channels/src/components/admin_console/admin_user_card/admin_user_card.scss
View File

@ -21,7 +21,7 @@
background-color: #295eb9; background-color: #295eb9;
} }
.AdminUserCard__header .Avatar.Avatar-xxl { .AdminUserCard__header .Avatar.Avatar-xxxxl {
border: solid 2px #fff; border: solid 2px #fff;
} }

4
webapp/channels/src/components/admin_console/admin_user_card/admin_user_card.tsx
View File

@ -31,7 +31,7 @@ const AdminUserCard = ({isLoading = false, ...props}: Props) => {
<div className='AdminUserCard__header'> <div className='AdminUserCard__header'>
<ProfilePicture <ProfilePicture
src='' src=''
size='xxl' size='xxxxl'
wrapperClass='admin-user-card' wrapperClass='admin-user-card'
/> />
</div> </div>
@ -54,7 +54,7 @@ const AdminUserCard = ({isLoading = false, ...props}: Props) => {
<div className='AdminUserCard__header'> <div className='AdminUserCard__header'>
<ProfilePicture <ProfilePicture
src={Client4.getProfilePictureUrl(props.user.id, props.user.last_picture_update)} src={Client4.getProfilePictureUrl(props.user.id, props.user.last_picture_update)}
size='xxl' size='xxxxl'
wrapperClass='admin-user-card' wrapperClass='admin-user-card'
userId={props.user.id} userId={props.user.id}
/> />

4
webapp/channels/src/components/post_view/channel_intro_message/channel_intro_message.tsx
View File

@ -175,7 +175,7 @@ function createGMIntroMessage(
<ProfilePicture <ProfilePicture
key={'introprofilepicture' + profile.id} key={'introprofilepicture' + profile.id}
src={Utils.imageURLForUser(profile.id, profile.last_picture_update)} src={Utils.imageURLForUser(profile.id, profile.last_picture_update)}
size='xl-custom-GM' size='xxl'
userId={profile.id} userId={profile.id}
username={profile.username} username={profile.username}
/> />
@ -265,7 +265,7 @@ function createDMIntroMessage(
<div className='post-profile-img__container channel-intro-img'> <div className='post-profile-img__container channel-intro-img'>
<ProfilePicture <ProfilePicture
src={src} src={src}
size='xl-custom-DM' size='xxxl'
status={teammate.is_bot ? '' : channel.status} status={teammate.is_bot ? '' : channel.status}
userId={teammate?.id} userId={teammate?.id}
username={teammate?.username} username={teammate?.username}

2
webapp/channels/src/components/widgets/users/avatar/avatar.scss
View File

@ -55,7 +55,7 @@
font-size: 18px; font-size: 18px;
} }
&.Avatar-xxl { &.Avatar-xxxxl {
width: 128px; width: 128px;
min-width: 128px; min-width: 128px;
height: 128px; height: 128px;

8
webapp/channels/src/components/widgets/users/avatar/avatar.tsx
View File

@ -27,11 +27,11 @@ export const getAvatarWidth = (size: TAvatarSizeToken) => {
return 36; return 36;
case 'xl': case 'xl':
return 50; return 50;
case 'xl-custom-DM':
return 96;
case 'xl-custom-GM':
return 72;
case 'xxl': case 'xxl':
return 72;
case 'xxxl':
return 96;
case 'xxxxl':
return 128; return 128;
} }
return 0; return 0;

2
webapp/channels/src/components/widgets/users/avatars/avatars.scss
View File

@ -37,7 +37,7 @@
--border-width: 2px; --border-width: 2px;
} }
&.Avatars___xxl { &.Avatars___xxxxl {
--offset: -26px; --offset: -26px;
--border-width: 5px; --border-width: 5px;
} }