diff options
| author | ThibG <thib@sitedethib.com> | 2018-11-29 21:47:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-29 21:47:18 +0100 |
| commit | b65daa25faab0fbefd367b3cbbe4d32bfd8c5820 (patch) | |
| tree | 4ec696e3bfd7406b0fbe54f71aed649241663ecf /app/views/settings | |
| parent | 6a264c9379a50cb94afc8dd369bfc5b626a9c4d1 (diff) | |
| parent | ad7a3974cc48946b5cb8182da4f9e236aa5e39a1 (diff) | |
Merge pull request #835 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index 6c4a8fdfb..2ba236fb5 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -14,9 +14,10 @@ = render 'application/card', account: @account .fields-row__column.fields-group.fields-row__column-6 + = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT)) + = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT)) - = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT)) %hr.spacer/ |