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

diff --git a/app/javascript/styles/mastodon/footer.scss b/app/javascript/styles/mastodon/footer.scss
index fe2d40c0cc384ce00768a580c4f50fcf655ab215..81eb1ce2d31e2003c36e261dddb66c24a9cce753 100644 (file)
--- 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 96ae2323464e3b2901379876c23ddd72990d5d01..558ced010f32053e831f315c7369ec0c07cb7811 100644 (file)
--- 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