about summary refs log tree commit diff
path: root/app/views/accounts
diff options
context:
space:
mode:
authorblackle <isabelle@blackle-mori.com>2017-01-09 22:40:45 -0500
committerblackle <isabelle@blackle-mori.com>2017-01-09 22:41:47 -0500
commit917cf0bf5d248469a5ce464cf0bba1cfd1ab9d50 (patch)
treec0d233bd37e983c7a60b269149cf603b848386a8 /app/views/accounts
parent131bae89fd3ea601b032c9650edb3693801c9467 (diff)
simplify emojification on public pages with .emojify class
Diffstat (limited to 'app/views/accounts')
-rw-r--r--app/views/accounts/_grid_card.html.haml4
-rw-r--r--app/views/accounts/_header.html.haml4
2 files changed, 4 insertions, 4 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)
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index 7a5cea7ab..f575e855e 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -11,13 +11,13 @@
         = link_to t('accounts.remote_follow'), account_remote_follow_path(@account), class: 'button'
   .avatar= image_tag @account.avatar.url(:original), class: 'u-photo'
   %h1.name
-    %span.p-name= display_name(@account)
+    %span.p-name.emojify= display_name(@account)
     %small
       %span.p-nickname= "@#{@account.username}"
       = fa_icon('lock') if @account.locked?
   .details
     .bio
-      .account__header__content.p-note= Formatter.instance.simplified_format(@account)
+      .account__header__content.p-note.emojify= Formatter.instance.simplified_format(@account)
 
     .details-counters
       .counter{ class: active_nav_class(account_url(@account)) }