about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-06-07 22:40:55 +0200
committerGitHub <noreply@github.com>2018-06-07 22:40:55 +0200
commit9b9e96eae50c68dc40b5fe04a0d29deafe91b58a (patch)
tree8d0ec870b332ed79e9dffecc5dd28641ca5fbe34 /app
parent0c3ce41031d292734e0e4cc70d227228d1993bea (diff)
Add "Edit profile" link to public profile page, increase bottom padding (#7754)
Diffstat (limited to 'app')
-rw-r--r--app/javascript/styles/mastodon/footer.scss1
-rw-r--r--app/views/accounts/_follow_button.html.haml5
2 files changed, 6 insertions, 0 deletions
diff --git a/app/javascript/styles/mastodon/footer.scss b/app/javascript/styles/mastodon/footer.scss
index fe2d40c0c..81eb1ce2d 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 96ae23234..558ced010 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