From 917cf0bf5d248469a5ce464cf0bba1cfd1ab9d50 Mon Sep 17 00:00:00 2001 From: blackle Date: Mon, 9 Jan 2017 22:40:45 -0500 Subject: simplify emojification on public pages with .emojify class --- app/views/accounts/_grid_card.html.haml | 4 ++-- app/views/accounts/_header.html.haml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app/views/accounts') 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)) } -- cgit