about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2017-04-10 15:27:52 -0400
committerEugen <eugen@zeonfederated.com>2017-04-10 21:27:52 +0200
commitd2f6d9b9fbe59575846141ca094324da9cd7de4d (patch)
tree96cda65c1ba7a3a8b5c426bd0f4698512d99b577 /app
parentdbe9f33fdc9a995b07ff3b1dcd93ad02cd336649 (diff)
Fix issue with missing emojify class in views (#1455)
* Add missing emojify class to landing strip

* Add missing emojify class to simple_status partial
Diffstat (limited to 'app')
-rw-r--r--app/views/shared/_landing_strip.html.haml5
-rw-r--r--app/views/stream_entries/_status.html.haml2
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/shared/_landing_strip.html.haml b/app/views/shared/_landing_strip.html.haml
index bb081e544..3536c5ca8 100644
--- a/app/views/shared/_landing_strip.html.haml
+++ b/app/views/shared/_landing_strip.html.haml
@@ -1,2 +1,5 @@
 .landing-strip
-  = t('landing_strip_html', name: display_name(account), domain: Rails.configuration.x.local_domain, sign_up_path: new_user_registration_path)
+  = t('landing_strip_html',
+    name: content_tag(:span, display_name(account), class: :emojify),
+    domain: Rails.configuration.x.local_domain,
+    sign_up_path: new_user_registration_path)
diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml
index 434c5c8da..1333d4d82 100644
--- a/app/views/stream_entries/_status.html.haml
+++ b/app/views/stream_entries/_status.html.haml
@@ -13,7 +13,7 @@
         = fa_icon('retweet fw')
       %span
         = link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
-          %strong= display_name(status.account)
+          %strong.emojify= display_name(status.account)
         = t('stream_entries.reblogged')
 
   = render partial: centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status', locals: { status: status.proper }