diff options
| -rw-r--r-- | app/assets/stylesheets/stream_entries.scss | 6 | ||||
| -rw-r--r-- | app/helpers/stream_entries_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/stream_entries/_status.html.haml | 25 |
3 files changed, 23 insertions, 12 deletions
diff --git a/app/assets/stylesheets/stream_entries.scss b/app/assets/stylesheets/stream_entries.scss index bcdadee24..93880237c 100644 --- a/app/assets/stylesheets/stream_entries.scss +++ b/app/assets/stylesheets/stream_entries.scss @@ -14,7 +14,7 @@ &.entry-predecessor, &.entry-successor { background: #d9e1e8; border-left-color: #d9e1e8; - border-bottom-color: darken(#d9e1e8, 15%); + border-bottom-color: darken(#d9e1e8, 10%); .header { .header__right { @@ -25,6 +25,10 @@ } } + &.entry-center { + border-bottom-color: darken(#d9e1e8, 10%); + } + &.entry-follow, &.entry-favourite { .content { padding-top: 10px; diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index b044e8a61..a29014d1b 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -27,4 +27,8 @@ module StreamEntriesHelper def favourited_by_me_class(status) user_signed_in? && current_user.account.favourited?(status) ? 'favourited' : '' end + + def proper_status(status) + status.reblog? ? status.reblog : status + end end diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index 11a9ac8e0..d210805fe 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -1,6 +1,7 @@ - include_threads ||= false - is_predecessor ||= false - is_successor ||= false +- centered = include_threads && !is_predecessor && !is_successor - if status.reply? && include_threads - status.ancestors.with_includes.with_counters.each do |status| @@ -20,20 +21,22 @@ .entry__container__container .header .header__left - = link_to url_for_target(status.reblog? ? status.reblog.account : status.account), class: 'name' do - %strong= display_name(status.reblog? ? status.reblog.account : status.account) - = "@#{status.reblog? ? status.reblog.account.acct : status.account.acct}" - = link_to url_for_target(status.reblog? ? status.reblog : status), class: 'time' do - %span{ title: status.reblog? ? status.reblog.created_at : status.created_at } - = relative_time(status.reblog? ? status.reblog.created_at : status.created_at) + = link_to url_for_target(proper_status(status).account), class: 'name' do + %strong= display_name(proper_status(status).account) + = "@#{proper_status(status).account.acct}" + = link_to url_for_target(proper_status(status)), class: 'time' do + %span{ title: proper_status(status).created_at } + = relative_time(proper_status(status).created_at) + .header__right - .counter-btn{ class: reblogged_by_me_class(status) } + .counter-btn{ class: reblogged_by_me_class(proper_status(status)) } %i.fa.fa-retweet - %span.counter-number= status.reblog? ? status.reblog.reblogs_count : status.reblogs_count - .counter-btn{ class: favourited_by_me_class(status) } + %span.counter-number= proper_status(status).reblogs_count + .counter-btn{ class: favourited_by_me_class(proper_status(status)) } %i.fa.fa-star - %span.counter-number= status.reblog? ? status.reblog.favourites_count : status.favourites_count - .content= content_for_status(status.reblog? ? status.reblog : status) + %span.counter-number= proper_status(status).favourites_count + + .content= content_for_status(proper_status(status)) - if include_threads - status.descendants.with_includes.with_counters.each do |status| |