PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2017-11-29 22:04:48 +00:00
commit 8c315c7e0b
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/skins/vector/css/themes/_base.scss
View file

@ -49,7 +49,7 @@ $plinth-bg-color: $secondary-accent-color;
$droptarget-bg-color: rgba(255,255,255,0.5); $droptarget-bg-color: rgba(255,255,255,0.5);
// used by AddressSelector // used by AddressSelector
$selected-color: #eaf5f0; $selected-color: $secondary-accent-color;
// selected for hoverover & selected event tiles // selected for hoverover & selected event tiles
$event-selected-color: #f7f7f7; $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); $roomtile-focused-bg-color: rgba(255, 255, 255, 0.9);
$roomsublist-label-fg-color: $h3-color; $roomsublist-label-fg-color: $h3-color;
$roomsublist-label-bg-color: #d3efe1; $roomsublist-label-bg-color: $tertiary-accent-color;
$roomsublist-chevron-color: $accent-color; $roomsublist-chevron-color: $accent-color;
$panel-divider-color: rgba(118, 207, 166, 0.2); $panel-divider-color: rgba(118, 207, 166, 0.2);
// ******************** // ********************
$widget-menu-bar-bg-color: #d3efe1; $widget-menu-bar-bg-color: $tertiary-accent-color;
// ******************** // ********************

7
src/skins/vector/css/themes/_dark.scss
View file

@ -29,12 +29,13 @@ $preview-bar-bg-color: #333;
// left-panel style muted accent color // left-panel style muted accent color
$secondary-accent-color: $primary-bg-color; $secondary-accent-color: $primary-bg-color;
$tertiary-accent-color: #454545;
// stop the tinter trying to change the secondary accent color // stop the tinter trying to change the secondary accent color
// by overriding the key to something untintable // by overriding the key to something untintable
// XXX: this is a bit of a hack. // XXX: this is a bit of a hack.
#mx_theme_secondaryAccentColor { #mx_theme_secondaryAccentColor {
color: #c0ff33 ! important; // deliberately off by one color: #c0ffee ! important;
} }
#mx_theme_tertiaryAccentColor { #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); $roomtile-focused-bg-color: rgba(255, 255, 255, 0.2);
$roomsublist-label-fg-color: $h3-color; $roomsublist-label-fg-color: $h3-color;
$roomsublist-label-bg-color: #454545; $roomsublist-label-bg-color: $tertiary-accent-color;
$roomsublist-chevron-color: $accent-color; $roomsublist-chevron-color: $accent-color;
$panel-divider-color: rgba(118, 207, 166, 0.2); $panel-divider-color: rgba(118, 207, 166, 0.2);
// ******************** // ********************
$widget-menu-bar-bg-color: #454545; $widget-menu-bar-bg-color: $tertiary-accent-color;
// ******************** // ********************