Clean up h-card mess of divs
parent
72c3a41bef
commit
1bfbce7b45
|
@ -15,10 +15,10 @@ module StreamEntriesHelper
|
|||
|
||||
def entry_classes(status, is_predecessor, is_successor, include_threads)
|
||||
classes = ['entry']
|
||||
classes << 'entry-reblog' if status.reblog?
|
||||
classes << 'entry-predecessor' if is_predecessor
|
||||
classes << 'entry-successor' if is_successor
|
||||
classes << 'entry-center' if include_threads
|
||||
classes << 'entry-reblog u-repost-of h-cite' if status.reblog?
|
||||
classes << 'entry-predecessor u-in-reply-to h-cite' if is_predecessor
|
||||
classes << 'entry-successor u-comment h-cite' if is_successor
|
||||
classes << 'entry-center h-entry' if include_threads
|
||||
classes.join(' ')
|
||||
end
|
||||
|
||||
|
|
|
@ -3,22 +3,20 @@
|
|||
- is_successor ||= false
|
||||
- centered ||= include_threads && !is_predecessor && !is_successor
|
||||
|
||||
%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 }
|
||||
- if status.reply? && include_threads
|
||||
= render partial: 'status', collection: @ancestors, as: :status, locals: { is_predecessor: true }
|
||||
|
||||
.entry{ class: entry_classes(status, is_predecessor, is_successor, include_threads) }
|
||||
- if status.reblog?
|
||||
.pre-header
|
||||
%div.pre-header__icon
|
||||
= fa_icon('retweet fw')
|
||||
%span
|
||||
= link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
|
||||
%strong= display_name(status.account)
|
||||
= t('stream_entries.reblogged')
|
||||
.entry{ class: entry_classes(status, is_predecessor, is_successor, include_threads) }
|
||||
- if status.reblog?
|
||||
.pre-header
|
||||
%div.pre-header__icon
|
||||
= fa_icon('retweet fw')
|
||||
%span
|
||||
= link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
|
||||
%strong= display_name(status.account)
|
||||
= t('stream_entries.reblogged')
|
||||
|
||||
%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) }
|
||||
= render partial: centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status', locals: { status: proper_status(status) }
|
||||
|
||||
- if include_threads
|
||||
= render partial: 'status', collection: @descendants, as: :status, locals: { is_successor: true }
|
||||
- if include_threads
|
||||
= render partial: 'status', collection: @descendants, as: :status, locals: { is_successor: true }
|
||||
|
|
Loading…
Reference in New Issue