Improving borders between predecessor/successor statuses

diff --git a/app/assets/stylesheets/stream_entries.scss b/app/assets/stylesheets/stream_entries.scss
index ef302bc89730a31c6b410c5917e6afec865f198e..bcdadee24e7d65ef3cdeb37c21bd8ef4ec1a3a1e 100644 (file)
--- a/app/assets/stylesheets/stream_entries.scss
+++ b/app/assets/stylesheets/stream_entries.scss
@@ -14,6 +14,7 @@
     &.entry-predecessor, &.entry-successor {
       background: #d9e1e8;
       border-left-color: #d9e1e8;
+      border-bottom-color: darken(#d9e1e8, 15%);
 
       .header {
         .header__right {

diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml
index dff03716cf3b7d8f41182585d7eb4a172e71f34f..72d99af6fdfa8c354c9792244e61bf882e04deaa 100644 (file)
--- a/app/views/stream_entries/_status.html.haml
+++ b/app/views/stream_entries/_status.html.haml
@@ -1,6 +1,10 @@
+- include_threads ||= false
+- is_predecessor  ||= false
+- is_successor    ||= false
+
 - if status.reply? && include_threads
   - status.ancestors.with_includes.with_counters.each do |status|
-    = render partial: 'status', locals: { status: status, include_threads: false, is_predecessor: true, is_successor: false }
+    = render partial: 'status', locals: { status: status, is_predecessor: true }
 
 .entry{ class: entry_classes(status, is_predecessor, is_successor, include_threads) }
   - if status.reblog?
@@ -34,4 +38,4 @@
 
 - if include_threads
   - status.descendants.with_includes.with_counters.each do |status|
-    = render partial: 'status', locals: { status: status, include_threads: false, is_successor: true, is_predecessor: false }
+    = render partial: 'status', locals: { status: status, is_successor: true }

diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml
index a951120acb6ccbda83be5fd1998e7ec845e8217c..b162586794cd4b1e09b4dbc1c77eac29dfd6ce88 100644 (file)
--- a/app/views/stream_entries/show.html.haml
+++ b/app/views/stream_entries/show.html.haml
@@ -2,4 +2,4 @@
   %link{ rel: 'alternate', type: 'application/atom+xml', href: account_stream_entry_url(@account, @stream_entry, format: 'atom') }/
 
 .activity-stream.activity-stream-headless
-  = render partial: @type, locals: { @type.to_sym => @stream_entry.activity, include_threads: true, is_predecessor: false, is_successor: false }
+  = render partial: @type, locals: { @type.to_sym => @stream_entry.activity, include_threads: true }