diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-01-10 12:21:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-10 12:21:06 +0100 |
| commit | 67a31454ad7614a593bcaf080619f4da5f04ef7c (patch) | |
| tree | f0490fc55c3ce2da56aa8ad303254a55addc307e /app/views/stream_entries/_detailed_status.html.haml | |
| parent | 205ba000174e1c553b871ee4ef1313e282e68a68 (diff) | |
| parent | 917cf0bf5d248469a5ce464cf0bba1cfd1ab9d50 (diff) | |
Merge pull request #450 from blackle/master
simplify emojification on public pages with .emojify class
Diffstat (limited to 'app/views/stream_entries/_detailed_status.html.haml')
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index b0d36872c..32f7c2e40 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -4,10 +4,10 @@ %div.avatar = image_tag status.account.avatar.url(:original), width: 48, height: 48, alt: '', class: 'u-photo' %span.display-name - %strong.p-name= display_name(status.account) + %strong.p-name.emojify= display_name(status.account) %span.p-nickname= acct(status.account) - .status__content.e-content.p-name= Formatter.instance.format(status) + .status__content.e-content.p-name.emojify= Formatter.instance.format(status) - unless status.media_attachments.empty? - if status.media_attachments.first.video? |