From f5186e1a33e17152c923e5e407ec238e3c040299 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Fri, 20 Nov 2020 16:02:47 +0200 Subject: [PATCH 1/2] add back red line --- CHANGELOG.md | 1 + src/components/conversation/conversation.vue | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f21dc4c..123e5347 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Fixed the occasional bug where screen would scroll 1px when typing into a reply form - Fixed timeline errors locking timelines +- Fixed missing highlighted border in expanded conversations ### Changed - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index e0b9fcc5..89ac6bdc 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -58,6 +58,8 @@ &.-expanded { .conversation-status { + border-left-style: solid; + border-left-width: 4px; border-color: $fallback--border; border-color: var(--border, $fallback--border); border-left-color: $fallback--cRed; From 11f7b818b4f07c0281ba85ed694a6d862401f7e2 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Fri, 20 Nov 2020 16:20:08 +0200 Subject: [PATCH 2/2] try another approach --- src/components/conversation/conversation.vue | 9 --------- src/components/status/status.scss | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 89ac6bdc..fd0dfa8f 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -57,15 +57,6 @@ } &.-expanded { - .conversation-status { - border-left-style: solid; - border-left-width: 4px; - border-color: $fallback--border; - border-color: var(--border, $fallback--border); - border-left-color: $fallback--cRed; - border-left-color: var(--cRed, $fallback--cRed); - } - .conversation-status:last-child { border-bottom: none; border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius; diff --git a/src/components/status/status.scss b/src/components/status/status.scss index 0a94de32..70c6d03d 100644 --- a/src/components/status/status.scss +++ b/src/components/status/status.scss @@ -29,6 +29,8 @@ $status-margin: 0.75em; &.-conversation { border-left-width: 4px; border-left-style: solid; + border-left-color: $fallback--cRed; + border-left-color: var(--cRed, $fallback--cRed); } .gravestone {