cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Add "Edit profile" link to public profile page, increase bottom padding (#7754)

This commit is contained in:
Eugen Rochko 2018-06-07 22:40:55 +02:00 committed by GitHub
parent 0c3ce41031
commit 9b9e96eae5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/styles/mastodon/footer.scss
View File

@ -1,6 +1,7 @@
.footer { .footer {
text-align: center; text-align: center;
margin-top: 30px; margin-top: 30px;
padding-bottom: 60px;
font-size: 12px; font-size: 12px;
color: $darker-text-color; color: $darker-text-color;

5
app/views/accounts/_follow_button.html.haml
View File

@ -15,6 +15,11 @@
= link_to (account.local? ? account_follow_path(account) : authorize_follow_path(acct: account.acct)), data: { method: :post }, class: 'icon-button' do = link_to (account.local? ? account_follow_path(account) : authorize_follow_path(acct: account.acct)), data: { method: :post }, class: 'icon-button' do
= fa_icon 'user-plus' = fa_icon 'user-plus'
= t('accounts.follow') = t('accounts.follow')
- elsif user_signed_in? && current_account.id == account.id
.controls
= link_to settings_profile_url, class: 'icon-button' do
= fa_icon 'pencil'
= t('settings.edit_profile')
- elsif !user_signed_in? - elsif !user_signed_in?
.controls .controls
.remote-follow .remote-follow