From 367b84f6c67736393a7cb305950daeea383295a2 Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Thu, 13 Aug 2020 00:25:34 +0200 Subject: [PATCH] mild: simplify and no longer need BELL_OVERLAY --- data/themes/base16_ocean_dark.edc | 1 - data/themes/black.edc | 1 - data/themes/default/colors.edc | 1 - data/themes/mild.edc | 9 +++------ data/themes/mustang.edc | 1 - 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/data/themes/base16_ocean_dark.edc b/data/themes/base16_ocean_dark.edc index 94693f86..eda89bd9 100644 --- a/data/themes/base16_ocean_dark.edc +++ b/data/themes/base16_ocean_dark.edc @@ -6,7 +6,6 @@ #define FG_COLOR_NO_ALPHA 192 197 206 #define FG_COLOR FG_COLOR_NO_ALPHA 255 -#define BELL_OVERLAY_COLOR 43 48 59 32 #define INHERIT_PROVIDE_OWN_COLORS 1 collections { diff --git a/data/themes/black.edc b/data/themes/black.edc index fedaeb8a..14798391 100644 --- a/data/themes/black.edc +++ b/data/themes/black.edc @@ -1,5 +1,4 @@ #define BG_COLOR 0 0 0 255 #define BG_COLOR_TRANSLUCENT 0 0 0 200 -#define BELL_OVERLAY_COLOR 220 220 220 32 #include "mild.edc" diff --git a/data/themes/default/colors.edc b/data/themes/default/colors.edc index 6da29425..d0b23b21 100644 --- a/data/themes/default/colors.edc +++ b/data/themes/default/colors.edc @@ -34,7 +34,6 @@ color_class { name: "TAB_TITLE"; color_class { name: "BG_SENDFILE"; color: 64 64 64 255; } color_class { name: "SHINE"; color: 255 255 255 255; } -color_class { name: "BELL_OVERLAY"; color: 200 200 200 255; } diff --git a/data/themes/mild.edc b/data/themes/mild.edc index 89f6035b..3596c6d4 100644 --- a/data/themes/mild.edc +++ b/data/themes/mild.edc @@ -1,9 +1,6 @@ /* overlay to default to make theme easier on the eyes, less effects */ -#ifndef BELL_OVERLAY_COLOR -#define BELL_OVERLAY_COLOR 220 220 220 16 -#endif #ifndef BG_COLOR_NO_ALPHA #define BG_COLOR_NO_ALPHA 48 48 48 #endif @@ -1380,8 +1377,8 @@ collections { } description { state: "pulse1" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; - color_class: "BELL_OVERLAY"; + color: 255 255 255 220; + color_class: "BG"; } description { state: "pulse2" 0.0; inherit: "default" 0.0; @@ -1399,7 +1396,7 @@ collections { description { state: "pulse2" 0.0; inherit: "default" 0.0; color: 255 255 255 32; - color_class: "BELL_OVERLAY"; + color_class: "BG"; visible: 1; } } diff --git a/data/themes/mustang.edc b/data/themes/mustang.edc index 2176c6b7..1a12d2ec 100644 --- a/data/themes/mustang.edc +++ b/data/themes/mustang.edc @@ -1,6 +1,5 @@ #define BG_COLOR 26 26 26 255 #define BG_COLOR_TRANSLUCENT 26 26 26 200 -#define BELL_OVERLAY_COLOR 220 220 220 32 #define INHERIT_PROVIDE_OWN_COLORS 1 collections {