From 72c3a41befb6407f21068ef4cb9e34187e3515f0 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 6 Jan 2017 20:15:24 +0100 Subject: Fix h-card classes and remote follow button appearing when it shouldn't --- app/views/stream_entries/_status.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/stream_entries/_status.html.haml') diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index eeb2fec00..29dcd6081 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -3,7 +3,7 @@ - is_successor ||= false - centered ||= include_threads && !is_predecessor && !is_successor -%div{ class: [is_predecessor && 'u-in-reply-to h-cite', is_successor && 'u-comment h-cite', !is_predecessor && !is_successor && 'h-entry'] } +%div{ class: [is_predecessor ? 'u-in-reply-to h-cite' : nil, is_successor ? 'u-comment h-cite' : nil, !is_predecessor && !is_successor ? 'h-entry' : nil].compact } - if status.reply? && include_threads = render partial: 'status', collection: @ancestors, as: :status, locals: { is_predecessor: true } @@ -17,7 +17,7 @@ %strong= display_name(status.account) = t('stream_entries.reblogged') - %div{ class: [status.reblog? && 'u-repost-of h-cite'] } + %div{ class: status.reblog? ? 'u-repost-of h-cite' : nil } = render partial: centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status', locals: { status: proper_status(status) } - if include_threads -- cgit