diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-07-28 19:25:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-28 19:25:33 +0200 |
| commit | bb71538bb503159177d46d8956bd466973c0876b (patch) | |
| tree | 41e39f53b365d91f83cfe393d75ddf8a1624ded9 /app/views/settings | |
| parent | e23b26178a71f90d64fe2a3e9e4468f265ecc71c (diff) | |
Redesign public profiles and toots (#8068)
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/migrations/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/views/settings/migrations/show.html.haml b/app/views/settings/migrations/show.html.haml index b7c34761f..c69061d50 100644 --- a/app/views/settings/migrations/show.html.haml +++ b/app/views/settings/migrations/show.html.haml @@ -6,7 +6,7 @@ %p.hint= t('migrations.currently_redirecting') .fields-group - = render partial: 'authorize_follows/card', locals: { account: @migration.account } + = render partial: 'application/card', locals: { account: @migration.account } = render 'shared/error_messages', object: @migration diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index a84f8a7da..3940eb855 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -8,8 +8,7 @@ = 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 - .card.compact{ style: "background-image: url(#{@account.header.url(:original)})", data: { original_src: @account.header.url(:original) } } - .avatar= image_tag @account.avatar.url(:original), data: { original_src: @account.avatar.url(:original) } + = render 'application/card', account: @account .fields-group = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar') |