about summary refs log tree commit diff
path: root/app/views/accounts/_header.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/_header.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/_header.html.haml')
-rw-r--r--app/views/accounts/_header.html.haml4
1 files changed, 2 insertions, 2 deletions
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)) }