diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-21 12:11:27 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-21 12:14:19 +0100 |
| commit | bf08d46e58c423688d870cf128ded7fd36009115 (patch) | |
| tree | 810df4b2a1b526fc19576416e5d75063e2aa4340 | |
| parent | 35aafdba961c90ecad04f38d4eec69100da36697 (diff) | |
Improving borders between predecessor/successor statuses
| -rw-r--r-- | app/assets/stylesheets/stream_entries.scss | 1 | ||||
| -rw-r--r-- | app/views/stream_entries/_status.html.haml | 8 | ||||
| -rw-r--r-- | app/views/stream_entries/show.html.haml | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/stylesheets/stream_entries.scss b/app/assets/stylesheets/stream_entries.scss index ef302bc89..bcdadee24 100644 --- 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 dff03716c..72d99af6f 100644 --- 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 a951120ac..b16258679 100644 --- 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 } |