diff options
| author | blackle <isabelle@blackle-mori.com> | 2017-01-09 22:40:45 -0500 |
|---|---|---|
| committer | blackle <isabelle@blackle-mori.com> | 2017-01-09 22:41:47 -0500 |
| commit | 917cf0bf5d248469a5ce464cf0bba1cfd1ab9d50 (patch) | |
| tree | c0d233bd37e983c7a60b269149cf603b848386a8 /app/views/stream_entries | |
| parent | 131bae89fd3ea601b032c9650edb3693801c9467 (diff) | |
simplify emojification on public pages with .emojify class
Diffstat (limited to 'app/views/stream_entries')
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 4 | ||||
| -rw-r--r-- | app/views/stream_entries/_favourite.html.haml | 2 | ||||
| -rw-r--r-- | app/views/stream_entries/_follow.html.haml | 2 | ||||
| -rw-r--r-- | app/views/stream_entries/_simple_status.html.haml | 4 |
4 files changed, 6 insertions, 6 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? diff --git a/app/views/stream_entries/_favourite.html.haml b/app/views/stream_entries/_favourite.html.haml index aac90dcdf..ea4879328 100644 --- a/app/views/stream_entries/_favourite.html.haml +++ b/app/views/stream_entries/_favourite.html.haml @@ -1,5 +1,5 @@ .entry.entry-favourite - .content + .content.emojify %strong= favourite.account.acct = t('stream_entries.favourited') %strong= favourite.status.account.acct diff --git a/app/views/stream_entries/_follow.html.haml b/app/views/stream_entries/_follow.html.haml index 1a2e2c554..da6d062f0 100644 --- a/app/views/stream_entries/_follow.html.haml +++ b/app/views/stream_entries/_follow.html.haml @@ -1,5 +1,5 @@ .entry.entry-follow - .content + .content.emojify %strong= link_to follow.account.acct, account_path(follow.account) = t('stream_entries.is_now_following') %strong= link_to follow.target_account.acct, TagManager.instance.url_for(follow.target_account) diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index b08cf5dab..eba2f9ac4 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -9,10 +9,10 @@ %div = image_tag status.account.avatar(: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? .status__attachments |