From 8a9c493f3a07fe3dce82f8d937ee2d4e971041cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Wed, 25 Aug 2021 09:17:22 +0200 Subject: [PATCH] Use correct color for a selected room in the MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/css/structures/_SpacePanel.scss | 2 +- res/css/views/rooms/_RoomTile.scss | 2 +- res/themes/dark/css/_dark.scss | 1 - res/themes/legacy-dark/css/_legacy-dark.scss | 1 + res/themes/legacy-light/css/_legacy-light.scss | 1 + res/themes/light-custom/css/_custom.scss | 2 +- res/themes/light/css/_light.scss | 1 - 7 files changed, 5 insertions(+), 5 deletions(-) diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss index 30d421a351..149436960e 100644 --- a/res/css/structures/_SpacePanel.scss +++ b/res/css/structures/_SpacePanel.scss @@ -19,7 +19,7 @@ $nestedHeight: 24px; $gutterSize: 16px; $activeBorderTransparentGap: 1px; -$activeBackgroundColor: $roomtile-selected-bg-color; +$activeBackgroundColor: $panel-actions; $activeBorderColor: $secondary-content; .mx_SpacePanel { diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss index 0c04f27115..0ec0b3988e 100644 --- a/res/css/views/rooms/_RoomTile.scss +++ b/res/css/views/rooms/_RoomTile.scss @@ -30,7 +30,7 @@ limitations under the License. &:hover, &:focus-within, &.mx_RoomTile_hasMenuOpen { - background-color: $roomtile-selected-bg-color; + background-color: $panel-actions; border-radius: 8px; } diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index e0e98d3b1f..6fbcc92e40 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -133,7 +133,6 @@ $groupFilterPanel-divider-color: $roomlist-header-color; $roomtile-preview-color: $secondary-content; $roomtile-default-badge-bg-color: #61708b; -$roomtile-selected-bg-color: rgba(141, 151, 165, 0.2); // ******************** diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss index 451f69cbc4..eda173c716 100644 --- a/res/themes/legacy-dark/css/_legacy-dark.scss +++ b/res/themes/legacy-dark/css/_legacy-dark.scss @@ -30,6 +30,7 @@ $tertiary-content: $tertiary-fg-color; $quaternary-content: #6F7882; $quinary-content: $quaternary-content; $background: $primary-bg-color; +$panel-actions: $roomtile-selected-bg-color; // used for dialog box text $light-fg-color: $header-panel-text-secondary-color; diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss index 542577a561..5810cdc584 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -38,6 +38,7 @@ $tertiary-content: $tertiary-fg-color; $quaternary-content: #C1C6CD; $quinary-content: #e3e8f0; $background: $primary-bg-color; +$panel-actions: $roomtile-selected-bg-color; // used for dialog box text $light-fg-color: #747474; diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss index af302bf252..641182ecf3 100644 --- a/res/themes/light-custom/css/_custom.scss +++ b/res/themes/light-custom/css/_custom.scss @@ -64,7 +64,7 @@ $authpage-modal-bg-color: var(--timeline-background-color-50pct); //still needs $roomheader-bg-color: var(--timeline-background-color); // // --roomlist-highlights-color -$roomtile-selected-bg-color: var(--roomlist-highlights-color); +$panel-actions: var(--roomlist-highlights-color); // // --sidebar-color $groupFilterPanel-bg-color: var(--sidebar-color); diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 9528018423..73aef42bca 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -195,7 +195,6 @@ $groupFilterPanel-divider-color: $roomlist-header-color; $roomtile-preview-color: $secondary-content; $roomtile-default-badge-bg-color: #61708b; -$roomtile-selected-bg-color: #FFF; $presence-online: $accent-color; $presence-away: #d9b072;