nrd.li/mastodon
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix #3220 - Show avatar/header on edit profile page (#4288)

Browse source
This commit is contained in:
Eugen Rochko 2017-07-21 05:28:51 +02:00 committed by GitHub
parent a390abdefb
commit 7bf7ed6123
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/javascript/styles/accounts.scss
View file

@ -26,6 +26,15 @@
z-index: 1; z-index: 1;
} }
&.compact {
padding: 30px 0;
border-radius: 4px;
.avatar {
margin-bottom: 0;
}
}
.name { .name {
display: block; display: block;
font-size: 20px; font-size: 20px;

4
app/javascript/styles/forms.scss
View file

@ -40,6 +40,10 @@ code {
} }
} }
.card {
margin-bottom: 15px;
}
strong { strong {
font-weight: 500; font-weight: 500;
} }

7
app/views/settings/profiles/show.html.haml
View file

@ -7,9 +7,16 @@
.fields-group .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 :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: 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 :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 :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header')
.fields-group
= f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked') = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
.actions .actions