From 9b9e96eae50c68dc40b5fe04a0d29deafe91b58a Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 7 Jun 2018 22:40:55 +0200 Subject: [PATCH] Add "Edit profile" link to public profile page, increase bottom padding (#7754) --- app/javascript/styles/mastodon/footer.scss | 1 + app/views/accounts/_follow_button.html.haml | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/app/javascript/styles/mastodon/footer.scss b/app/javascript/styles/mastodon/footer.scss index fe2d40c0cc..81eb1ce2d3 100644 --- a/app/javascript/styles/mastodon/footer.scss +++ b/app/javascript/styles/mastodon/footer.scss @@ -1,6 +1,7 @@ .footer { text-align: center; margin-top: 30px; + padding-bottom: 60px; font-size: 12px; color: $darker-text-color; diff --git a/app/views/accounts/_follow_button.html.haml b/app/views/accounts/_follow_button.html.haml index 96ae232346..558ced010f 100644 --- a/app/views/accounts/_follow_button.html.haml +++ b/app/views/accounts/_follow_button.html.haml @@ -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 = fa_icon 'user-plus' = 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? .controls .remote-follow