diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-21 05:28:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-21 05:28:51 +0200 |
| commit | 7bf7ed6123ad6e29f1356f58be0dbe89deed841b (patch) | |
| tree | df0faf06be96de4717326e4b797517dfc007e4ec /app | |
| parent | a390abdefb5d741ba4375858a79fbf3eaf30f06d (diff) | |
Fix #3220 - Show avatar/header on edit profile page (#4288)
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/styles/accounts.scss | 9 | ||||
| -rw-r--r-- | app/javascript/styles/forms.scss | 4 | ||||
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 9 |
3 files changed, 21 insertions, 1 deletions
diff --git a/app/javascript/styles/accounts.scss b/app/javascript/styles/accounts.scss index 801817d80..d5c18e1e3 100644 --- a/app/javascript/styles/accounts.scss +++ b/app/javascript/styles/accounts.scss @@ -26,6 +26,15 @@ z-index: 1; } + &.compact { + padding: 30px 0; + border-radius: 4px; + + .avatar { + margin-bottom: 0; + } + } + .name { display: block; font-size: 20px; diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss index e1de36d55..c467aa7db 100644 --- a/app/javascript/styles/forms.scss +++ b/app/javascript/styles/forms.scss @@ -40,6 +40,10 @@ code { } } + .card { + margin-bottom: 15px; + } + strong { font-weight: 500; } diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index 2b846006f..e0fb613f8 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -7,10 +7,17 @@ .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 + + .card.compact{ style: "background-image: url(#{@account.header.url(:original)})" } + .avatar= image_tag @account.avatar.url(:original) + + .fields-group = 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') - = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked') + .fields-group + = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked') .actions = f.button :button, t('generic.save_changes'), type: :submit |