forked from treehouse/mastodon
Fix h-card classes and remote follow button appearing when it shouldn't
parent
8b28b82141
commit
72c3a41bef
|
@ -1,11 +1,11 @@
|
|||
.card.h-card{ class: [local_assigns[:in_feed] && 'p-author'], style: "background-image: url(#{@account.header.url( :original)})" }
|
||||
.card.h-card.p-author{ style: "background-image: url(#{@account.header.url( :original)})" }
|
||||
- if user_signed_in? && current_account.id != @account.id && !current_account.requested?(@account)
|
||||
.controls
|
||||
- if current_account.following?(@account)
|
||||
= link_to t('accounts.unfollow'), unfollow_account_path(@account), data: { method: :post }, class: 'button'
|
||||
- else
|
||||
= link_to t('accounts.follow'), follow_account_path(@account), data: { method: :post }, class: 'button'
|
||||
- else
|
||||
- elsif !user_signed_in?
|
||||
.controls
|
||||
.remote-follow
|
||||
= link_to t('accounts.remote_follow'), account_remote_follow_path(@account), class: 'button'
|
||||
|
|
|
@ -15,8 +15,9 @@
|
|||
%meta{ property: 'twitter:card', content: 'summary' }/
|
||||
|
||||
.h-feed
|
||||
%data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" }
|
||||
= render partial: 'header', locals: {in_feed: true}
|
||||
%data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/
|
||||
|
||||
= render partial: 'header'
|
||||
|
||||
- if @statuses.empty?
|
||||
.accounts-grid
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue