diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-04-20 16:45:40 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-20 16:45:40 +0200 |
| commit | 63dc7cfa904d83b92151597aa745963996a9c926 (patch) | |
| tree | 1cf2d3225374c6d8f55bcf1c36f0b4ce5aee0911 /app/views | |
| parent | d5530827c984238f93100ee737ed209d61e316c0 (diff) | |
| parent | f2cf91277119c63044bdd45e599f37dc829b6eb2 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/tags/show.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index 7413be1db..841c01fd7 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -17,9 +17,9 @@ = 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 :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: picture_hint(t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT)), @account.header) - = 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 :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: picture_hint(t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT)), @account.avatar) %hr.spacer/ diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml index 74d44bd7b..d15f119ed 100644 --- a/app/views/tags/show.html.haml +++ b/app/views/tags/show.html.haml @@ -11,5 +11,5 @@ %h1= "##{@tag.name}" %p= t('about.about_hashtag_html', hashtag: @tag.name) -#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name)) }} +#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name, local: @local)) }} #modal-container |