From 62939f13483c5566a30c9da9b37052ddea8c73a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Tue, 9 Feb 2021 07:40:29 +0100 Subject: [PATCH 1/3] Fix scrollbar colors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/dark/css/_dark.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index 08fe2e9f57..b4d1fc9fcc 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -258,6 +258,7 @@ $composer-shadow-color: rgba(0, 0, 0, 0.28); // markdown overrides: .mx_EventTile_content .markdown-body pre:hover { border-color: #808080 !important; // inverted due to rules below + scrollbar-color: auto; } .mx_EventTile_content .markdown-body { pre, code { From e2bf0c84d7011f59c30ebd3bc3a61fab4c6a3662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Tue, 9 Feb 2021 08:16:36 +0100 Subject: [PATCH 2/3] Move icons to the left MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We do this because they would otherwise collide with the scrollbar Signed-off-by: Šimon Brandner --- res/css/views/rooms/_EventTile.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index da94f914f7..42df3211de 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -532,7 +532,7 @@ $left-gutter: 64px; visibility: hidden; cursor: pointer; top: 6px; - right: 6px; + right: 12px; width: 19px; height: 19px; background-color: $message-action-bar-fg-color; From 4aa30008940a30c01afb150103080fe1886b73fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Thu, 11 Feb 2021 13:31:06 +0100 Subject: [PATCH 3/3] Leverage our theme colours Co-authored-by: J. Ryan Stinnett --- res/themes/dark/css/_dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index b4d1fc9fcc..612b8e03bd 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -258,7 +258,7 @@ $composer-shadow-color: rgba(0, 0, 0, 0.28); // markdown overrides: .mx_EventTile_content .markdown-body pre:hover { border-color: #808080 !important; // inverted due to rules below - scrollbar-color: auto; + scrollbar-color: rgba(0, 0, 0, 0.2) transparent; // copied from light theme due to inversion below } .mx_EventTile_content .markdown-body { pre, code {