commit: 5faca01261a3babe9eab982a69404386875d596b
parent 3d013630aee48863cda5ece9ddf9a291703eb1af
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Mon, 22 Feb 2021 18:53:26 +0000
Merge branch 'fix/redline-final-v2' into 'develop'
fix redline again
See merge request pleroma/pleroma-fe!1353
Diffstat:
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed
- Button to remove uploaded media in post status form is now properly placed and sized.
- Fixed shoutbox not working in mobile layout
+- Fixed missing highlighted border in expanded conversations again
- Fixed some UI jumpiness when opening images particularly in chat view
### Changed
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
@@ -50,7 +50,6 @@
.Conversation {
.conversation-status {
- border-left: none;
border-bottom-width: 1px;
border-bottom-style: solid;
border-bottom-color: var(--border, $fallback--border);