From 5d4153fa6418394f73a29e060cc7f5df0679fb4b Mon Sep 17 00:00:00 2001
From: Germain <germains@element.io>
Date: Mon, 17 Jul 2023 10:59:10 +0100
Subject: [PATCH] Fix colour regressions (#11273)
* Fix color contrast of notice events
Fixes https://github.com/vector-im/element-web/issues/25808
* Restore alert color for highlighted events
Fixes https://github.com/vector-im/element-web/issues/25788
* Fix quote border for highlighted events
Fixes https://github.com/vector-im/element-web/issues/25811
* Fix media background mixing with event highlighted
Fixes https://github.com/vector-im/element-web/issues/25812
---
res/css/views/messages/_MNoticeBody.pcss | 2 +-
res/css/views/messages/_MediaBody.pcss | 2 +-
res/css/views/rooms/_EventTile.pcss | 2 +-
res/themes/legacy-light/css/_legacy-light.pcss | 2 +-
res/themes/light/css/_light.pcss | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/res/css/views/messages/_MNoticeBody.pcss b/res/css/views/messages/_MNoticeBody.pcss
index a88c20863d..b68bfd2c03 100644
--- a/res/css/views/messages/_MNoticeBody.pcss
+++ b/res/css/views/messages/_MNoticeBody.pcss
@@ -16,5 +16,5 @@ limitations under the License.
.mx_MNoticeBody {
white-space: pre-wrap;
- opacity: 0.6;
+ color: $secondary-content;
}
diff --git a/res/css/views/messages/_MediaBody.pcss b/res/css/views/messages/_MediaBody.pcss
index 40a5a2d075..b4fd93058d 100644
--- a/res/css/views/messages/_MediaBody.pcss
+++ b/res/css/views/messages/_MediaBody.pcss
@@ -18,7 +18,7 @@ limitations under the License.
/* have unique styles). */
.mx_MediaBody {
- background-color: $quinary-content;
+ background-color: $panels;
border-radius: 12px;
max-width: 243px; /* use max-width instead of width so it fits within right panels */
diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss
index 6a7a390952..ce5d5044ad 100644
--- a/res/css/views/rooms/_EventTile.pcss
+++ b/res/css/views/rooms/_EventTile.pcss
@@ -143,7 +143,7 @@ $left-gutter: 64px;
&.mx_EventTile_highlight,
&.mx_EventTile_highlight .markdown-body,
&.mx_EventTile_highlight .mx_EventTile_edited {
- color: $primary-content;
+ color: $alert;
}
&.mx_EventTile_bubbleContainer {
diff --git a/res/themes/legacy-light/css/_legacy-light.pcss b/res/themes/legacy-light/css/_legacy-light.pcss
index 6e166c7168..be8ad29f65 100644
--- a/res/themes/legacy-light/css/_legacy-light.pcss
+++ b/res/themes/legacy-light/css/_legacy-light.pcss
@@ -110,7 +110,7 @@ $neutral-badge-color: #dbdbdb;
$preview-widget-bar-color: #ddd;
-$blockquote-bar-color: #ddd;
+$blockquote-bar-color: var(--cpd-color-border-interactive-primary);
$settings-grey-fg-color: #a2a2a2;
$settings-subsection-fg-color: #61708b;
diff --git a/res/themes/light/css/_light.pcss b/res/themes/light/css/_light.pcss
index 11c57be3f1..f80787ec6c 100644
--- a/res/themes/light/css/_light.pcss
+++ b/res/themes/light/css/_light.pcss
@@ -103,7 +103,7 @@ $muted-fg-color: #61708b;
$light-fg-color: #747474;
$focus-bg-color: $preview-widget-bar-color;
$info-plinth-bg-color: #f7f7f7;
-$event-selected-color: #f6f7f8;
+$event-selected-color: var(--cpd-color-bg-subtle-secondary);
$topleftmenu-color: #212121;
$roomtopic-color: #9e9e9e;
$spacePanel-bg-color: rgba(232, 232, 232, 0.77);
@@ -115,7 +115,7 @@ $header-panel-text-primary-color: #91a1c0;
/* Blockquote */
/* ******************** */
-$blockquote-bar-color: $focus-bg-color;
+$blockquote-bar-color: var(--cpd-color-border-interactive-primary);
/* ******************** */
/* Tooltip */