Merge branch 'fix/RED-LINE' into 'develop'

fix #1010 Add back conversation red line

Closes #1010

See merge request pleroma/pleroma-fe!1292
This commit is contained in:
HJ 2020-11-21 12:10:39 +00:00
commit 14ce0c1c07
3 changed files with 3 additions and 7 deletions

View file

@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed ### Fixed
- Fixed the occasional bug where screen would scroll 1px when typing into a reply form - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
- Fixed timeline errors locking timelines - Fixed timeline errors locking timelines
- Fixed missing highlighted border in expanded conversations
### Changed ### Changed
- Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers

View file

@ -57,13 +57,6 @@
} }
&.-expanded { &.-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 { .conversation-status:last-child {
border-bottom: none; border-bottom: none;
border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius; border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;

View file

@ -29,6 +29,8 @@ $status-margin: 0.75em;
&.-conversation { &.-conversation {
border-left-width: 4px; border-left-width: 4px;
border-left-style: solid; border-left-style: solid;
border-left-color: $fallback--cRed;
border-left-color: var(--cRed, $fallback--cRed);
} }
.gravestone { .gravestone {