diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-11-21 12:10:39 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-11-21 12:10:39 +0000 |
| commit | 14ce0c1c073e17060a7d3cbe4352a5e9881c03dd (patch) | |
| tree | 0ac022b1fd2518f363c8530e0597a1953da7cb49 | |
| parent | 838cbd87151d7f00019b8f0d9753ed5b172bb9d9 (diff) | |
| parent | 11f7b818b4f07c0281ba85ed694a6d862401f7e2 (diff) | |
Merge branch 'fix/RED-LINE' into 'develop'
fix #1010 Add back conversation red line
Closes #1010
See merge request pleroma/pleroma-fe!1292
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/components/conversation/conversation.vue | 7 | ||||
| -rw-r--r-- | src/components/status/status.scss | 2 |
3 files changed, 3 insertions, 7 deletions
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..fd0dfa8f 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -57,13 +57,6 @@ } &.-expanded { - .conversation-status { - 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 { |