Merge branch 'edit-profile-top' into 'develop'
EditProfile: move profile preview (avatar/banner) to the top See merge request soapbox-pub/soapbox!2002
This commit is contained in:
commit
9fb1f69cd2
1 changed files with 20 additions and 19 deletions
|
@ -310,6 +310,26 @@ const EditProfile: React.FC = () => {
|
||||||
return (
|
return (
|
||||||
<Column label={intl.formatMessage(messages.header)}>
|
<Column label={intl.formatMessage(messages.header)}>
|
||||||
<Form onSubmit={handleSubmit}>
|
<Form onSubmit={handleSubmit}>
|
||||||
|
<div className='grid grid-cols-1 md:grid-cols-2 gap-4'>
|
||||||
|
<ProfilePreview account={previewAccount} />
|
||||||
|
|
||||||
|
<div className='space-y-4'>
|
||||||
|
<FormGroup
|
||||||
|
labelText={<FormattedMessage id='edit_profile.fields.header_label' defaultMessage='Choose Background Picture' />}
|
||||||
|
hintText={<FormattedMessage id='edit_profile.hints.header' defaultMessage='PNG, GIF or JPG. Will be downscaled to {size}' values={{ size: '1920x1080px' }} />}
|
||||||
|
>
|
||||||
|
<FileInput onChange={handleFileChange('header', 1920 * 1080)} />
|
||||||
|
</FormGroup>
|
||||||
|
|
||||||
|
<FormGroup
|
||||||
|
labelText={<FormattedMessage id='edit_profile.fields.avatar_label' defaultMessage='Choose Profile Picture' />}
|
||||||
|
hintText={<FormattedMessage id='edit_profile.hints.avatar' defaultMessage='PNG, GIF or JPG. Will be downscaled to {size}' values={{ size: '400x400px' }} />}
|
||||||
|
>
|
||||||
|
<FileInput onChange={handleFileChange('avatar', 400 * 400)} />
|
||||||
|
</FormGroup>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<FormGroup
|
<FormGroup
|
||||||
labelText={<FormattedMessage id='edit_profile.fields.display_name_label' defaultMessage='Display name' />}
|
labelText={<FormattedMessage id='edit_profile.fields.display_name_label' defaultMessage='Display name' />}
|
||||||
>
|
>
|
||||||
|
@ -369,25 +389,6 @@ const EditProfile: React.FC = () => {
|
||||||
/>
|
/>
|
||||||
</FormGroup>
|
</FormGroup>
|
||||||
|
|
||||||
<div className='grid grid-cols-1 md:grid-cols-2 gap-4'>
|
|
||||||
<ProfilePreview account={previewAccount} />
|
|
||||||
|
|
||||||
<div className='space-y-4'>
|
|
||||||
<FormGroup
|
|
||||||
labelText={<FormattedMessage id='edit_profile.fields.header_label' defaultMessage='Choose Background Picture' />}
|
|
||||||
hintText={<FormattedMessage id='edit_profile.hints.header' defaultMessage='PNG, GIF or JPG. Will be downscaled to {size}' values={{ size: '1920x1080px' }} />}
|
|
||||||
>
|
|
||||||
<FileInput onChange={handleFileChange('header', 1920 * 1080)} />
|
|
||||||
</FormGroup>
|
|
||||||
<FormGroup
|
|
||||||
labelText={<FormattedMessage id='edit_profile.fields.avatar_label' defaultMessage='Choose Profile Picture' />}
|
|
||||||
hintText={<FormattedMessage id='edit_profile.hints.avatar' defaultMessage='PNG, GIF or JPG. Will be downscaled to {size}' values={{ size: '400x400px' }} />}
|
|
||||||
>
|
|
||||||
<FileInput onChange={handleFileChange('avatar', 400 * 400)} />
|
|
||||||
</FormGroup>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<List>
|
<List>
|
||||||
{features.followRequests && (
|
{features.followRequests && (
|
||||||
<ListItem
|
<ListItem
|
||||||
|
|
Loading…
Reference in a new issue