put in missing macros - they didnt get picked up during cnflict merge fix

diff --git a/data/themes/fonts.edc b/data/themes/fonts.edc
index a196ee4..a7fba6d 100644 (file)
--- a/data/themes/fonts.edc
+++ b/data/themes/fonts.edc
@@ -27,31 +27,25 @@
 #define FN_COL_DISABLE_SHADOW 21 21 21 255; color3: 255 255 255 192
 #define FN_COL_TRANSPARENT 255 255 255 0; color3: 0 0 0 0
 #define FN_COL_WHITE_GLOW 255 255 255 255; color2: 255 255 255 24; color3: 255 255 255 18
-
 /* e/module/conf_colors/preview/text */
 #define FN_COL_SHADOW 255 255 255 32
 #define FN_COL_OUTLINE_SHADOW 255 255 255 255; color2: 255 255 255 255; color3: 255 255 255 255
-
 /* temperature.edc */
 #define FN_COL_SHADOW_BOTTOM 255 255 255 0; color2: 0 0 0 255; color3: 0 0 0 0
-
 /* elm/diskselector */
 #define FN_COL_WHITE 255 255 255 255
 #define FN_COL_GREY_152 152 152 152 255
 #define FN_COL_GREY_172 172 172 172 255
-
 /* elm/flipselector */
 #define FN_COL_GREY_192 192 192 192 255; color3: 0 0 0 128
 /* TBD: This could probably just be disabled */
 #define FN_COL_GREY_16 16 16 16 255; color3: 255 255 255 25
-
 /* elm/various */
 /*  TBD: should this just be the normal disabled */
 #define FN_COL_DISABLE_LIGHTER_SHADOW 21 21 21 255; color3: 255 255 255 15
-
-/* elm/segment_control.edc */
-/* TBD: Is this the same as DEFAULT_BASIC */
-#define FN_COL_DEFAULT_BASIC2  255 255 255 255; color3: 255 255 255 0
+/* xkbswitch.edc */
+#define FN_COL_OUTLINE_TRANSPARENT 255 255 255 0; color2: 0 0 0 0; color3: 0 0 0 0;
+#define FN_COL_OUTLINE_DEFAULT 255 255 255 255; color2: 0 0 0 128; color3: 0 0 0 24;
 
 #define ENABLED_TEXTBLOCK_TAGS                                             \
    tag: "em" "+ font_style=Oblique";                                       \