From f72b44650b70694a6141e45df21c6632d137f24a Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 29 Nov 2017 22:04:40 +0000 Subject: [PATCH] fix tertiary accent colors --- src/skins/vector/css/themes/_base.scss | 6 +++--- src/skins/vector/css/themes/_dark.scss | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss index 327f2e4a28..d5e862aec6 100644 --- a/src/skins/vector/css/themes/_base.scss +++ b/src/skins/vector/css/themes/_base.scss @@ -49,7 +49,7 @@ $plinth-bg-color: $secondary-accent-color; $droptarget-bg-color: rgba(255,255,255,0.5); // used by AddressSelector -$selected-color: #eaf5f0; +$selected-color: $secondary-accent-color; // selected for hoverover & selected event tiles $event-selected-color: #f7f7f7; @@ -105,14 +105,14 @@ $roomtile-selected-bg-color: rgba(255, 255, 255, 0.8); $roomtile-focused-bg-color: rgba(255, 255, 255, 0.9); $roomsublist-label-fg-color: $h3-color; -$roomsublist-label-bg-color: #d3efe1; +$roomsublist-label-bg-color: $tertiary-accent-color; $roomsublist-chevron-color: $accent-color; $panel-divider-color: rgba(118, 207, 166, 0.2); // ******************** -$widget-menu-bar-bg-color: #d3efe1; +$widget-menu-bar-bg-color: $tertiary-accent-color; // ******************** diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss index c140f7079f..60ffeca8ee 100644 --- a/src/skins/vector/css/themes/_dark.scss +++ b/src/skins/vector/css/themes/_dark.scss @@ -29,12 +29,13 @@ $preview-bar-bg-color: #333; // left-panel style muted accent color $secondary-accent-color: $primary-bg-color; +$tertiary-accent-color: #454545; // stop the tinter trying to change the secondary accent color // by overriding the key to something untintable // XXX: this is a bit of a hack. #mx_theme_secondaryAccentColor { - color: #c0ff33 ! important; // deliberately off by one + color: #c0ffee ! important; } #mx_theme_tertiaryAccentColor { @@ -103,14 +104,14 @@ $roomtile-selected-bg-color: rgba(255, 255, 255, 0.05); $roomtile-focused-bg-color: rgba(255, 255, 255, 0.2); $roomsublist-label-fg-color: $h3-color; -$roomsublist-label-bg-color: #454545; +$roomsublist-label-bg-color: $tertiary-accent-color; $roomsublist-chevron-color: $accent-color; $panel-divider-color: rgba(118, 207, 166, 0.2); // ******************** -$widget-menu-bar-bg-color: #454545; +$widget-menu-bar-bg-color: $tertiary-accent-color; // ********************