autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable custom emojis in profiles (notes, field values, display names) (#7374)

Browse Source 
Follow-up to #6124
This commit is contained in:
Eugen Rochko
2018-05-06 11:48:51 +02:00
committed by GitHub
parent bd10a7e480
commit 61a9018607
17 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/about/_administration.html.haml
View File

@ -6,7 +6,7 @@
.account__avatar{ style: "background-image: url(#{@instance_presenter.contact_account.avatar.url})" }
%span.display-name
%bdi
%strong.display-name__html.emojify= display_name(@instance_presenter.contact_account)
%strong.display-name__html.emojify= display_name(@instance_presenter.contact_account, custom_emojify: true)
%span.display-name__account @#{@instance_presenter.contact_account.acct}
- else
.account__display-name

2
app/views/about/_contact.html.haml
View File

@ -12,7 +12,7 @@
.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)
%span.display_name.emojify= display_name(contact.contact_account, custom_emojify: true)
%span.username @#{contact.contact_account.acct}
- else
.owner