diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-06-25 19:19:52 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-06-25 19:19:52 -0700 |
| commit | b323e00bf38f490b6011505df2ff2b4db6b17421 (patch) | |
| tree | f489b788e67160e985e36c223bddcb19ff607783 /app/views/settings/profiles | |
| parent | a520b118e4653aa35a74eba6e1662dfc98fcd1cc (diff) | |
| parent | 93fc8aa14c914d03643197306c325becbaed2581 (diff) | |
Merge branch 'master' of https://github.com/glitch-soc/mastodon
Diffstat (limited to 'app/views/settings/profiles')
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index 2b846006f..8dc61fec9 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -6,7 +6,7 @@ .fields-group = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', count: 30 - @account.display_name.size).html_safe - = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 160 - @account.note.size).html_safe + = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 500 - @account.note.size).html_safe = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar') = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header') |