diff options
author | ThibG <thib@sitedethib.com> | 2018-08-11 15:28:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-11 15:28:06 +0200 |
commit | d787bcdeb1570e4d8d67f326dadaf321a6854e06 (patch) | |
tree | fa23a187b16bf07635312a7791013aacfc2c4474 /app/views/about/_contact.html.haml | |
parent | 03afc365d530e6d57754ae9dbbdbd0c56431ee02 (diff) | |
parent | 7067b64de33f9cd491e97329df266fde5fb49e42 (diff) |
Merge pull request #630 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/about/_contact.html.haml')
-rw-r--r-- | app/views/about/_contact.html.haml | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml deleted file mode 100644 index 3215d50b5..000000000 --- a/app/views/about/_contact.html.haml +++ /dev/null @@ -1,22 +0,0 @@ -.panel - .panel-header - = succeed ':' do - = t 'about.contact' - - if contact.site_contact_email.present? - = mail_to contact.site_contact_email, nil, title: contact.site_contact_email - - else - %span= t 'about.contact_unavailable' - .panel-body - - if contact.contact_account - .owner - .avatar= image_tag contact.contact_account.avatar.url - .name - = link_to TagManager.instance.url_for(contact.contact_account) do - %span.display_name.emojify= display_name(contact.contact_account, custom_emojify: true) - %span.username @#{contact.contact_account.acct} - - else - .owner - .avatar= image_tag full_asset_url('avatars/original/missing.png', skip_pipeline: true) - .name - %span.display_name= t 'about.contact_missing' - %span.username= t 'about.contact_unavailable' |