From 2d6ce31737a680865a9f0084e07f8ff28acb9731 Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Thu, 30 Apr 2015 11:35:00 +0200 Subject: Remove unused/nessacery font colors Signed-off-by: Olliver Schinagl --- data/themes/default/colorclasses.edc | 67 ------------------------------- data/themes/default/edc/elm/naviframe.edc | 8 ++-- data/themes/default/edc/elm/progress.edc | 4 +- data/themes/default/fonts.edc | 37 ++++------------- 4 files changed, 13 insertions(+), 103 deletions(-) diff --git a/data/themes/default/colorclasses.edc b/data/themes/default/colorclasses.edc index 38e9784..222da48 100644 --- a/data/themes/default/colorclasses.edc +++ b/data/themes/default/colorclasses.edc @@ -7,73 +7,6 @@ color_classes { color: WIN_COL_HIGHLIGHT; } -// comp - color_class { name: "comp_focus-out_color"; - color: 255 255 255 255; - } - color_class { name: "comp_focus_color"; - color: 255 255 255 255; - } - -// wm - color_class { name: "border_title"; - color: FN_COL_DISABLE; - } - color_class { name: "border_title_active"; - color: FN_COL_DEFAULT_SOFT_SHADOW; - } - color_class { name: "border_frame"; - color: WIN_DEFAULT_BASIC; - } - color_class { name: "border_frame_active"; - color: WIN_DEFAULT_BASIC; - } - color_class { name: "border_bottom"; - color: WIN_DEFAULT_BASIC; - } - color_class { name: "move_text"; - color: FN_COL_DEFAULT; - } - color_class { name: "resize_text"; - color: FN_COL_DEFAULT; - } - color_class { name: "menu_base"; - color: WIN_DEFAULT_BASIC; - } - color_class { name: "menu_title"; - color: FN_COL_DISABLE; - } - color_class { name: "menu_item"; - color: FN_COL_DEFAULT; - } - color_class { name: "menu_item_active"; - color: FN_COL_HIGHLIGHT; - } - color_class { name: "menu_item_disabled"; - color: FN_COL_DISABLE; - } - color_class { name: "winlist_item"; - color: FN_COL_DEFAULT; - } - color_class { name: "winlist_item_active"; - color: FN_COL_HIGHLIGHT; - } - color_class { name: "winlist_label"; - color: FN_COL_DEFAULT; - } - color_class { name: "winlist_title"; - color: FN_COL_DISABLE; - } - color_class { name: "dialog_base"; - color: WIN_DEFAULT_BASIC; - } - color_class { name: "shelf_base"; - color: WIN_DEFAULT_BASIC; - } - color_class { name: "fileman_base"; - color: WIN_DEFAULT_BASIC; - } - // widgets color_class { name: "button_text"; color: FN_COL_DEFAULT; diff --git a/data/themes/default/edc/elm/naviframe.edc b/data/themes/default/edc/elm/naviframe.edc index 8f4b233..02c8fa8 100644 --- a/data/themes/default/edc/elm/naviframe.edc +++ b/data/themes/default/edc/elm/naviframe.edc @@ -138,7 +138,7 @@ group { name: "elm/naviframe/item/basic/default"; rel2.relative: 1.0 0.0; rel2.offset: -1 2; align: 0.5 0.0; - color: FN_COL_DEFAULT_SOFT_SHADOW; + color: FN_COL_DEFAULT; text { font: FN; size: 8; text: "X"; text_class: "title_bar_sub"; @@ -160,7 +160,7 @@ group { name: "elm/naviframe/item/basic/default"; rel2.to_y: "title1"; rel2.offset: -1 -1; align: 0.5 0.0; - color: FN_COL_DEFAULT_SOFT_SHADOW; + color: FN_COL_DEFAULT; text { font: FNBD; size: 10; text: "X"; text_class: "title_bar"; @@ -180,7 +180,7 @@ group { name: "elm/naviframe/item/basic/default"; rel2.to_y: "title2"; rel2.offset: -1 -3; align: 0.5 0.0; - color: FN_COL_DEFAULT_SOFT_SHADOW; + color: FN_COL_DEFAULT; text { font: FN; size: 8; text: "X"; text_class: "title_bar_sub"; @@ -309,7 +309,7 @@ group { name: "elm/naviframe/item/basic/default"; rel2.to_y: "top"; rel2.relative: 1.0 0.5; align: 0.5 0.5; - color: FN_COL_DEFAULT_SOFT_SHADOW; + color: FN_COL_DEFAULT; text { font: FNBD; size: 10; text_class: "title_bar"; align: 0.5 0.5; diff --git a/data/themes/default/edc/elm/progress.edc b/data/themes/default/edc/elm/progress.edc index 981c3c4..23c4a22 100644 --- a/data/themes/default/edc/elm/progress.edc +++ b/data/themes/default/edc/elm/progress.edc @@ -144,7 +144,7 @@ group { name: "elm/progressbar/horizontal/default"; description { state: "disabled_visible" 0.0; inherit: "visible" 0.0; color_class: "progressbar_text_disabled"; - color: FN_COL_DISABLE_LIGHTER_SHADOW; + color: FN_COL_DISABLE; } } part { name: "bg-hi"; @@ -701,7 +701,7 @@ group { name: "elm/progressbar/vertical/default"; description { state: "disabled_visible" 0.0; inherit: "visible" 0.0; color_class: "progressbar_text_disabled"; - color: FN_COL_DISABLE_LIGHTER_SHADOW; + color: FN_COL_DISABLE; } } part { name: "bg-hi"; diff --git a/data/themes/default/fonts.edc b/data/themes/default/fonts.edc index a98983a..30aba78 100644 --- a/data/themes/default/fonts.edc +++ b/data/themes/default/fonts.edc @@ -17,36 +17,13 @@ #define FN_COL_DEFAULT_BASIC 0 0 0 255 /* fonts.edc not sure if this one is neccesary */ -#define FN_COL_DEFAULT 255 255 255 255; color3: 0 0 0 128 -#define FN_COL_FOCUSED 0 0 0 255; color3: 0 0 0 128 -#define FN_COL_DEFAULT_SOFT_SHADOW 0 0 0 255; color3: 0 0 0 18 -#define FN_COL_HIGHLIGHT 0 0 0 255; color2: 51 153 255 24; color3: 51 153 255 18 -#define FN_COL_HIGHLIGHT_CLICKED 255 255 255 255; color2: 51 153 255 64; color3: 51 153 255 32 -#define FN_COL_HIGHLIGHT_DISABLE 51 153 255 64; color2: 51 153 255 16; color3: 51 153 255 8 -#define FN_COL_MID_GREY 128 128 128 255 -#define FN_COL_DISABLE 21 21 21 255; color3: 255 255 255 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 -/* 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 FN_COL_DEFAULT 255 255 255 255; +#define FN_COL_FOCUSED 0 0 0 255; +#define FN_COL_HIGHLIGHT 0 0 0 255; +#define FN_COL_HIGHLIGHT_CLICKED 255 255 255 255; +#define FN_COL_HIGHLIGHT_DISABLE 0 0 0 255; +#define FN_COL_DISABLE 0 0 0 255; +#define FN_COL_TRANSPARENT 255 255 255 0; #define ENABLED_TEXTBLOCK_TAGS \ tag: "em" "+ font_style=Oblique"; \ -- cgit v0.12