From fc3c4fccc2a3b8d6f4d7a2d737fba6cb26df014b Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 2 Jul 2019 18:31:11 +0200 Subject: [PATCH] set background on highlighted messages --- res/css/views/rooms/_EventTile.scss | 8 ++++++-- res/themes/dark/css/_dark.scss | 3 +++ res/themes/light/css/_light.scss | 10 ++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index 02eb0049d9..9f14cf1b00 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -201,8 +201,12 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody { .mx_EventTile_highlight, .mx_EventTile_highlight .markdown-body - { - color: $warning-color; +{ + color: $event-highlight-fg-color; + + .mx_EventTile_line { + background-color: $event-highlight-bg-color; + } } .mx_EventTile_contextual { diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index ed1cc162a0..f2bfe5bc8a 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -121,6 +121,9 @@ $event-sending-color: $text-secondary-color; $event-redacted-fg-color: #606060; $event-redacted-border-color: #000000; +$event-highlight-fg-color: $warning-color; +$event-highlight-bg-color: $event-selected-color; + // event timestamp $event-timestamp-color: $text-secondary-color; diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 2dd193b8c5..159b9a6b76 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -195,12 +195,18 @@ $panel-divider-color: #dee1f3; $widget-menu-bar-bg-color: $secondary-accent-color; // ******************** - +// both $event-highlight-bg-color and $room-warning-bg-color share this value, +// so to not make their order dependent on who depends on who, have a shared value +// defined before both +$yellow-background: #fff8e3; // event tile lifecycle $event-encrypting-color: #abddbc; $event-sending-color: #ddd; $event-notsent-color: #f44; +$event-highlight-fg-color: $warning-color; +$event-highlight-bg-color: $yellow-background; + // event redaction $event-redacted-fg-color: #e2e2e2; $event-redacted-border-color: #cccccc; @@ -244,7 +250,7 @@ $togglesw-ball-color: #fff; $progressbar-color: #000; -$room-warning-bg-color: #fff8e3; +$room-warning-bg-color: $yellow-background; $memberstatus-placeholder-color: $roomtile-name-color;