From 9f61cb8137f54122bc864fab9c8ca7e54e45697e Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 15 Nov 2017 00:57:44 +0000 Subject: [PATCH] turns out that we /do/ use tertiaryAccentColor after all --- src/skins/vector/css/_common.scss | 4 ++++ src/skins/vector/css/themes/_dark.scss | 6 +++++- src/skins/vector/themes/status/css/_status.scss | 6 +++++- src/vector/index.html | 4 ++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss index 8a333071cd..c598e7cddc 100644 --- a/src/skins/vector/css/_common.scss +++ b/src/skins/vector/css/_common.scss @@ -132,6 +132,10 @@ textarea { color: $secondary-accent-color; } +#mx_theme_tertiaryAccentColor { + color: $roomsublist-label-bg-color; +} + .mx_Dialog_wrapper { position: fixed; z-index: 4000; diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss index 5fe6c3c0ba..e474d278ce 100644 --- a/src/skins/vector/css/themes/_dark.scss +++ b/src/skins/vector/css/themes/_dark.scss @@ -34,7 +34,11 @@ $secondary-accent-color: $primary-bg-color; // by overriding the key to something untintable // XXX: this is a bit of a hack. #mx_theme_secondaryAccentColor { - color: #2d2d2e ! important; // deliberately off by one + color: #c0ff33 ! important; // deliberately off by one +} + +#mx_theme_tertiaryAccentColor { + color: #c0ffee ! important; } // used by RoomDirectory permissions diff --git a/src/skins/vector/themes/status/css/_status.scss b/src/skins/vector/themes/status/css/_status.scss index 229d9b927a..bd05efa020 100644 --- a/src/skins/vector/themes/status/css/_status.scss +++ b/src/skins/vector/themes/status/css/_status.scss @@ -90,7 +90,11 @@ $secondary-accent-color: #586C7B; // by overriding the key to something untintable // XXX: this is a bit of a hack. #mx_theme_secondaryAccentColor { - color: #586C7C ! important; // deliberately off by one + color: #c0ffee ! important; +} + +#mx_theme_tertiaryAccentColor { + color: #c0ffee ! important; } // used by RoomDirectory permissions diff --git a/src/vector/index.html b/src/vector/index.html index 36047aca7a..8568d96a92 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -27,7 +27,7 @@ if (match) { var title = match[1].charAt(0).toUpperCase() + match[1].slice(1); %> - + <% } else { %> <% } @@ -73,6 +73,6 @@