about summary refs log tree commit diff
path: root/app/views/accounts/_grid_card.html.haml
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-01-10 12:21:06 +0100
committerGitHub <noreply@github.com>2017-01-10 12:21:06 +0100
commit67a31454ad7614a593bcaf080619f4da5f04ef7c (patch)
treef0490fc55c3ce2da56aa8ad303254a55addc307e /app/views/accounts/_grid_card.html.haml
parent205ba000174e1c553b871ee4ef1313e282e68a68 (diff)
parent917cf0bf5d248469a5ce464cf0bba1cfd1ab9d50 (diff)
Merge pull request #450 from blackle/master
simplify emojification on public pages with .emojify class
Diffstat (limited to 'app/views/accounts/_grid_card.html.haml')
-rw-r--r--app/views/accounts/_grid_card.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/accounts/_grid_card.html.haml b/app/views/accounts/_grid_card.html.haml
index dfdb23161..d5418fca5 100644
--- a/app/views/accounts/_grid_card.html.haml
+++ b/app/views/accounts/_grid_card.html.haml
@@ -3,6 +3,6 @@
     .avatar= image_tag account.avatar.url(:original)
     .name
       = link_to TagManager.instance.url_for(account) do
-        %span.display_name= display_name(account)
+        %span.display_name.emojify= display_name(account)
         %span.username= "@#{account.acct}"
-  %p.note= truncate(strip_tags(account.note), length: 150)
+  %p.note.emojify= truncate(strip_tags(account.note), length: 150)