diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index 7f0686491..cef442de2 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -495,6 +495,13 @@ const conversation = { [id]: nextStatus, } }, + getStatusClasses(status, active) { + return { + '-virtual-active': active, + '-last': status.id === this.conversation[this.conversation.length - 1].id, + '-first': status.id === this.conversation[0].id, + } + }, toggleThreadDisplay(id) { const curStatus = this.threadDisplayStatus[id] const nextStatus = curStatus === 'showing' ? 'hidden' : 'showing' diff --git a/src/components/conversation/conversation.scss b/src/components/conversation/conversation.scss index 99ecb338a..ae06dbfa7 100644 --- a/src/components/conversation/conversation.scss +++ b/src/components/conversation/conversation.scss @@ -6,6 +6,15 @@ backdrop-filter: var(--__panel-backdrop-filter); } + .conversation-status:not(.-last) { + border-bottom: 1px solid var(--border); + } + + .conversation-status:not(.-last) + .conversation-status:not(.-first) { + border-radius: 0; + } + .conversation-dive-to-top-level-box { padding: var(--status-margin); border-bottom: 1px solid var(--border); @@ -49,26 +58,12 @@ padding: var(--status-margin); } - .conversation-status { - border-bottom: 1px solid var(--border); - border-radius: 0; - } - - .thread-ancestor-has-other-replies .conversation-status, - &:last-child:not(.-expanded) .conversation-status, - &.-expanded .conversation-status:last-child, - .thread-ancestor:last-child .conversation-status, - .thread-ancestor:last-child .thread-ancestor-dive-box, - &.-expanded .thread-tree .conversation-status { - border-bottom: none; - } - .thread-ancestors + .thread-tree > .conversation-status { border-top: 1px solid var(--border); } /* expanded conversation in timeline */ - &.status-fadein.-expanded .thread-body { + &.-expanded .thread-body { border-left: 4px solid var(--cRed); border-radius: var(--roundness); border-top-left-radius: 0; @@ -76,7 +71,7 @@ border-bottom: 1px solid var(--border); } - &.-expanded.status-fadein { + &.-expanded:not(.-page) { --___margin: calc(var(--status-margin) / 2); background: var(--background); diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 94c4db188..5199f4443 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -2,7 +2,7 @@