From 61d816659c6b6bd4c8b1e223af017bc043717a44 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Fri, 2 Apr 2021 01:53:26 +0100 Subject: [PATCH] elm theme - remove color_classes - preparing to redo them --- data/elementary/themes/edc/border.edc | 1 - data/elementary/themes/edc/comp.edc | 3 -- data/elementary/themes/edc/comp_compat.edc | 10 ++----- data/elementary/themes/edc/deskmirror.edc | 4 +-- data/elementary/themes/edc/efl/border.edc | 9 ++---- data/elementary/themes/edc/efl/button.edc | 6 ++-- data/elementary/themes/edc/efl/check.edc | 12 ++++---- data/elementary/themes/edc/efl/radio.edc | 6 ++-- data/elementary/themes/edc/efl/tags.edc | 4 +-- data/elementary/themes/edc/elm/border.edc | 5 ++-- data/elementary/themes/edc/elm/button.edc | 6 ++-- data/elementary/themes/edc/elm/check.edc | 12 ++++---- data/elementary/themes/edc/elm/colorclass.edc | 3 -- data/elementary/themes/edc/elm/entry.edc | 30 +++++++++---------- .../themes/edc/elm/multibuttonentry.edc | 2 +- data/elementary/themes/edc/elm/naviframe.edc | 1 - data/elementary/themes/edc/elm/notify.edc | 2 +- data/elementary/themes/edc/elm/popup.edc | 2 +- data/elementary/themes/edc/elm/radio.edc | 6 ++-- data/elementary/themes/edc/elm/scroller.edc | 1 - data/elementary/themes/edc/elm/uiclock.edc | 8 ++--- data/elementary/themes/edc/entry.edc | 8 ++--- data/elementary/themes/edc/evrything.edc | 1 - data/elementary/themes/edc/fontpreview.edc | 3 +- data/elementary/themes/edc/ilist.edc | 3 -- data/elementary/themes/edc/pager.edc | 3 +- data/elementary/themes/edc/pager16.edc | 3 +- data/elementary/themes/edc/scrollframe.edc | 1 - 28 files changed, 63 insertions(+), 92 deletions(-) diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc index 9125ab1d79..d66eb14ddf 100644 --- a/data/elementary/themes/edc/border.edc +++ b/data/elementary/themes/edc/border.edc @@ -460,7 +460,6 @@ group { name: "e/widgets/border/default/border"; part { name: "bottom"; type: RECT; mouse_events: 0; scale: 1; description { state: "default" 0.0; - color_class: "border_bottom"; color: 64 64 64 255; rel1.relative: 0.0 1.0; rel2.relative: 1.0 1.0; diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc index ea1db457b3..6f39a9673e 100644 --- a/data/elementary/themes/edc/comp.edc +++ b/data/elementary/themes/edc/comp.edc @@ -248,12 +248,10 @@ group { name: "e/comp/frame/default"; clip_to: "clipper"; mouse_events: 0; description { state: "default" 0.0; - color_class: "comp_focus-out_color"; rel.to: "clipper"; } description { state: "focused" 0.0; inherit; - color_class: "comp_focus_color"; color: 255 255 255 255; } } @@ -432,7 +430,6 @@ group { name: "e/comp/frame/popup"; parts { part { name: "focus-clipper"; description { state: "default"; - color_class: ""; } } } diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc index ca6ce18715..c9646aa5d0 100644 --- a/data/elementary/themes/edc/comp_compat.edc +++ b/data/elementary/themes/edc/comp_compat.edc @@ -39,26 +39,21 @@ group { name: "e/comp/border/default"; rel2.relative: 1.0 1.0; } } - part { name: "trans-clipper"; - type: RECT; + part { name: "trans-clipper"; type: RECT; clip_to: "clipper"; mouse_events: 0; description { state: "default" 0.0; - color_class: "comp_alpha"; rel.to: "clipper"; } } - part { name: "focus-clipper"; - type: RECT; + part { name: "focus-clipper"; type: RECT; clip_to: "trans-clipper"; mouse_events: 0; description { state: "default" 0.0; - color_class: "comp_focus-out_color"; rel.to: "clipper"; } description { state: "focused" 0.0; inherit: "default" 0.0; - color_class: "comp_focus_color"; color: 255 255 255 255; } } @@ -230,7 +225,6 @@ group { name: "e/comp/border/popup"; parts { part { name: "focus-clipper"; description { state: "default"; - color_class: ""; } } } diff --git a/data/elementary/themes/edc/deskmirror.edc b/data/elementary/themes/edc/deskmirror.edc index c4f8f5d5ed..6b64c2374d 100644 --- a/data/elementary/themes/edc/deskmirror.edc +++ b/data/elementary/themes/edc/deskmirror.edc @@ -275,7 +275,7 @@ group { name: "e/deskmirror/frame/noresize"; } part { name: "bottom"; type: RECT; description { state: "default" 0.0; - color_class: "border_bottom"; + color: 64 64 64 255; rel1.relative: 0.0 1.0; rel1.offset: 0 -1; rel2.relative: 1.0 1.0; @@ -298,7 +298,7 @@ group { name: "e/deskmirror/frame/noresize_dialog"; } part { name: "bottom"; type: RECT; description { state: "default" 0.0; - color_class: "border_bottom"; + color: 64 64 64 255; rel1.relative: 0.0 1.0; rel1.offset: 0 -1; rel2.relative: 1.0 1.0; diff --git a/data/elementary/themes/edc/efl/border.edc b/data/elementary/themes/edc/efl/border.edc index 475b96f405..377e7ea658 100644 --- a/data/elementary/themes/edc/efl/border.edc +++ b/data/elementary/themes/edc/efl/border.edc @@ -104,9 +104,7 @@ group { "efl/border"; data.item: "version" "123"; required; // @since 1.19 clip: "bg_clip"; desc { "default"; -// color: 64 64 64 255; - color: 255 255 255 255; - color_class: "elm/win/background"; // FIXME: color_class naming scheme + color: 64 64 64 255; rel.to: "efl.spacer.content"; visible: 0; } @@ -138,7 +136,7 @@ group { "efl/border"; data.item: "version" "123"; /* main menu */ rect { "menu_bg"; desc { "default"; - color: 64 64 64 255; // FIXME: color_class + color: 64 64 64 255; align: 0.5 0.0; rel.to: "efl.menu"; fixed: 1 1; @@ -204,8 +202,7 @@ group { "efl/border"; data.item: "version" "123"; } desc { "visible"; inherit: "default"; - color_class: "elm/win/blocker"; - color: 255 255 255 255; + color: 32 32 32 255; vis; } } diff --git a/data/elementary/themes/edc/efl/button.edc b/data/elementary/themes/edc/efl/button.edc index 86c7fd1442..4f89d3eb92 100644 --- a/data/elementary/themes/edc/efl/button.edc +++ b/data/elementary/themes/edc/efl/button.edc @@ -89,13 +89,13 @@ group { name: "efl/button"; } rect { "icon_clip"; desc { "default"; - color_class: "button_icon"; + color: 255 255 255 255; } desc { "pressed"; inherit; - color_class: "button_icon_pressed"; + color: 255 255 255 255; } desc { "disabled"; inherit; - color_class: "button_icon_disabled"; + color: 255 255 255 64; } } swallow { "efl.content"; nomouse; required; diff --git a/data/elementary/themes/edc/efl/check.edc b/data/elementary/themes/edc/efl/check.edc index e2a82d698d..1077024873 100644 --- a/data/elementary/themes/edc/efl/check.edc +++ b/data/elementary/themes/edc/efl/check.edc @@ -47,13 +47,13 @@ group { name: "efl/check"; } rect { "icon_clip"; desc { "default"; - color_class: "button_icon"; + color: 255 255 255 255; } desc { "pressed"; inherit; - color_class: "button_icon_pressed"; + color: 255 255 255 255; } desc { "disabled"; inherit; - color_class: "button_icon_disabled"; + color: 255 255 255 64; } } swallow { "efl.background"; nomouse; @@ -323,13 +323,13 @@ group { name: "efl/check:toggle"; } rect { "icon_clip"; desc { "default"; - color_class: "button_icon"; + color: 255 255 255 255; } desc { "pressed"; inherit; - color_class: "button_icon_pressed"; + color: 255 255 255 255; } desc { "disabled"; inherit; - color_class: "button_icon_disabled"; + color: 255 255 255 64; } } swallow { "efl.content"; nomouse; diff --git a/data/elementary/themes/edc/efl/radio.edc b/data/elementary/themes/edc/efl/radio.edc index 06dff6fe08..f0549bf4d1 100644 --- a/data/elementary/themes/edc/efl/radio.edc +++ b/data/elementary/themes/edc/efl/radio.edc @@ -48,13 +48,13 @@ group { name: "efl/radio"; } rect { "icon_clip"; desc { "default"; - color_class: "button_icon"; + color: 255 255 255 255; } desc { "pressed"; inherit; - color_class: "button_icon_pressed"; + color: 255 255 255 255; } desc { "disabled"; inherit; - color_class: "button_icon_disabled"; + color: 255 255 255 64; } } swallow { "efl.content"; nomouse; diff --git a/data/elementary/themes/edc/efl/tags.edc b/data/elementary/themes/edc/efl/tags.edc index e179d36927..4aa3588417 100644 --- a/data/elementary/themes/edc/efl/tags.edc +++ b/data/elementary/themes/edc/efl/tags.edc @@ -7,7 +7,7 @@ group { "efl/tags"; rect { "bg"; scale; desc { "default"; - color_class: "tags_bg"; + color: 0 0 0 0; } } swallow { "efl.background"; @@ -158,7 +158,7 @@ group { "efl/tags/btn"; nomouse; scale; desc { "default"; - color_class: "tags_item_text"; + color: FN_COL_DEFAULT; text { style: "efl_tags_textblock_style"; min: 1 1; ellipsis: -1; diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc index e9977d018c..5e5a6354fc 100644 --- a/data/elementary/themes/edc/elm/border.edc +++ b/data/elementary/themes/edc/elm/border.edc @@ -137,7 +137,7 @@ group { name: "elm/border/base/default"; /* main menu */ rect { "menu_bg"; desc { "default"; - color: 64 64 64 255; // FIXME: color_class + color: 64 64 64 255; align: 0.5 0.0; rel.to: "elm.swallow.menu"; fixed: 1 1; @@ -201,8 +201,7 @@ group { name: "elm/border/base/default"; } desc { "visible"; inherit: "default"; - color_class: "elm/win/blocker"; - color: 255 255 255 255; + color: 32 32 32 255; vis; } } diff --git a/data/elementary/themes/edc/elm/button.edc b/data/elementary/themes/edc/elm/button.edc index 9365a67189..60d26592c0 100644 --- a/data/elementary/themes/edc/elm/button.edc +++ b/data/elementary/themes/edc/elm/button.edc @@ -55,13 +55,13 @@ group { name: "elm/button/base/default"; } rect { "icon_clip"; desc { "default"; - color_class: "button_icon"; + color: 255 255 255 255; } desc { "pressed"; inherit; - color_class: "button_icon_pressed"; + color: 255 255 255 255; } desc { "disabled"; inherit; - color_class: "button_icon_disabled"; + color: 255 255 255 64; } } swallow { "elm.swallow.content"; nomouse; diff --git a/data/elementary/themes/edc/elm/check.edc b/data/elementary/themes/edc/elm/check.edc index fa79abb8fd..b8019ffa7b 100644 --- a/data/elementary/themes/edc/elm/check.edc +++ b/data/elementary/themes/edc/elm/check.edc @@ -22,13 +22,13 @@ group { name: "elm/check/base/default"; } rect { "icon_clip"; desc { "default"; - color_class: "button_icon"; + color: 255 255 255 255; } desc { "pressed"; inherit; - color_class: "button_icon_pressed"; + color: 255 255 255 255; } desc { "disabled"; inherit; - color_class: "button_icon_disabled"; + color: 255 255 255 64; } } swallow { "elm.swallow.content"; nomouse; @@ -318,13 +318,13 @@ group { name: "elm/check/base/toggle"; } rect { "icon_clip"; desc { "default"; - color_class: "button_icon"; + color: 255 255 255 255; } desc { "pressed"; inherit; - color_class: "button_icon_pressed"; + color: 255 255 255 255; } desc { "disabled"; inherit; - color_class: "button_icon_disabled"; + color: 255 255 255 64; } } swallow { "elm.swallow.content"; nomouse; diff --git a/data/elementary/themes/edc/elm/colorclass.edc b/data/elementary/themes/edc/elm/colorclass.edc index bb21a4e105..947695a099 100644 --- a/data/elementary/themes/edc/elm/colorclass.edc +++ b/data/elementary/themes/edc/elm/colorclass.edc @@ -16,7 +16,6 @@ group { "elm/layout/colorclass/base"; program_source: "elm"; nobroadcast; rect { "list_bg"; desc { color: 64 64 64 255; - color_class: "dialog_base"; rel1.to: "elm.swallow.list"; rel2.to: "elm.swallow.list"; } @@ -93,14 +92,12 @@ group { "elm/layout/colorclass/base"; program_source: "elm"; nobroadcast; rect { "text_bg"; desc { hid; color: 64 64 64 255; - color_class: "dialog_base"; fixed: 1 1; rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; } desc { "vis"; color: 64 64 64 255; - color_class: "dialog_base"; rel1.to: "elm.swallow.list"; rel2.to: "elm.swallow.list"; } diff --git a/data/elementary/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc index 5e6fbf7ef6..ef0562273b 100644 --- a/data/elementary/themes/edc/elm/entry.edc +++ b/data/elementary/themes/edc/elm/entry.edc @@ -541,23 +541,23 @@ group { name: "elm/entry/anchor/default"; group { name: "elm/entry/base/default"; styles { style { name: "entry_style"; - base: "font="FN" font_size=10 color=#a0a0a0 wrap=word text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#a0a0a0 wrap=word text_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_nowrap_style"; - base: "font="FN" font_size=10 color=#a0a0a0 text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#a0a0a0 text_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_disabled_style"; - base: "font="FN" font_size=10 color=#707070 wrap=word text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#707070 wrap=word text_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_nowrap_disabled_style"; - base: "font="FN" font_size=10 color=#707070 text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#707070 text_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_guide_style"; - base: "font="FN" font_size=10 color=#505050 wrap=word text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; + base: "font="FN" font_size=10 color=#505050 wrap=word text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; DISABLED_TEXTBLOCK_TAGS } } @@ -667,15 +667,15 @@ group { name: "elm/entry/base-mixedwrap/default"; inherit: "elm/entry/base/default"; styles { style { name: "entry_style_mixedwrap"; - base: "font="FN" font_size=10 color=#a0a0a0 wrap=mixed text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#a0a0a0 wrap=mixed text_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_disabled_style_mixedwrap"; - base: "font="FN" font_size=10 color=#707070 wrap=mixed text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#707070 wrap=mixed text_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_guide_style_mixedwrap"; - base: "font="FN" font_size=10 color=#505050 wrap=mixed text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; + base: "font="FN" font_size=10 color=#505050 wrap=mixed text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; DISABLED_TEXTBLOCK_TAGS } } @@ -708,15 +708,15 @@ group { name: "elm/entry/base-charwrap/default"; inherit: "elm/entry/base/default"; styles { style { name: "entry_style_charwrap"; - base: "font="FN" font_size=10 color=#a0a0a0 wrap=char text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#a0a0a0 wrap=char text_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_disabled_style_charwrap"; - base: "font="FN" font_size=10 color=#707070 wrap=char text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#707070 wrap=char text_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_guide_style_charwrap"; - base: "font="FN" font_size=10 color=#505050 wrap=char text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; + base: "font="FN" font_size=10 color=#505050 wrap=char text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; DISABLED_TEXTBLOCK_TAGS } } @@ -782,15 +782,15 @@ group { name: "elm/entry/base-single/default"; alias: "elm/entry/base-single/combobox_vertical/entry"; styles { style { name: "entry_single_style"; - base: "font="FN" font_size=10 color=#a0a0a0 wrap=none text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#a0a0a0 wrap=none text_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } style { name: "entry_single_disabled_style"; - base: "font="FN" font_size=10 color=#707070 wrap=none text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#707070 wrap=none text_class=entry_text_disabled left_margin=2 right_margin=2"; DISABLED_TEXTBLOCK_TAGS } style { name: "entry_single_guide_style"; - base: "font="FN" font_size=10 color=#505050 wrap=none text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; + base: "font="FN" font_size=10 color=#505050 wrap=none text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; DISABLED_TEXTBLOCK_TAGS } } @@ -830,7 +830,7 @@ group { name: "elm/entry/base-single/spinner/default"; inherit: "elm/entry/base-single/default"; styles { style { name: "entry_single_spinner_style"; - base: "font="FN" font_size=10 color=#a0a0a0 align=center wrap=none text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#a0a0a0 align=center wrap=none text_class=entry_text left_margin=2 right_margin=2"; ENABLED_TEXTBLOCK_TAGS } } diff --git a/data/elementary/themes/edc/elm/multibuttonentry.edc b/data/elementary/themes/edc/elm/multibuttonentry.edc index 22470acde0..5ee16d5495 100644 --- a/data/elementary/themes/edc/elm/multibuttonentry.edc +++ b/data/elementary/themes/edc/elm/multibuttonentry.edc @@ -5,7 +5,7 @@ group { name: "elm/multibuttonentry/base/default"; parts { part { name: "bg"; type: RECT; description { state: "default" 0.0; - color_class: "multibuttonentry_bg"; + color: 0 0 0 0; } } part { name: "elm.swallow.background"; type: SWALLOW; diff --git a/data/elementary/themes/edc/elm/naviframe.edc b/data/elementary/themes/edc/elm/naviframe.edc index 3888d1a36f..d67333b561 100644 --- a/data/elementary/themes/edc/elm/naviframe.edc +++ b/data/elementary/themes/edc/elm/naviframe.edc @@ -148,7 +148,6 @@ group { name: "elm/naviframe/item/basic/default"; part { name: "title2"; type: TEXT; scale: 1; description { state: "default" 0.0; - color_class: "border_title_active"; rel1.to_y: "title1"; rel1.relative: 0.0 1.0; rel1.offset: 0 0; diff --git a/data/elementary/themes/edc/elm/notify.edc b/data/elementary/themes/edc/elm/notify.edc index f922dd11cf..34d85072bf 100644 --- a/data/elementary/themes/edc/elm/notify.edc +++ b/data/elementary/themes/edc/elm/notify.edc @@ -6,7 +6,7 @@ group { name: "elm/notify/block_events/default"; color: 0 0 0 0; } desc { "visible"; - color: 0 0 0 128; /* FIXME: color_class */ + color: 0 0 0 128; } } program { signal: "mouse,clicked,1"; source: "block_events"; diff --git a/data/elementary/themes/edc/elm/popup.edc b/data/elementary/themes/edc/elm/popup.edc index 7270934f3d..7db6913757 100644 --- a/data/elementary/themes/edc/elm/popup.edc +++ b/data/elementary/themes/edc/elm/popup.edc @@ -2,7 +2,7 @@ group { name: "elm/notify/block_events/popup/default"; inherit: "elm/notify/block_events/default"; parts.part { "block_events"; desc { "visible"; - color: 0 0 0 128; /* FIXME: color_class */ + color: 0 0 0 128; } } } diff --git a/data/elementary/themes/edc/elm/radio.edc b/data/elementary/themes/edc/elm/radio.edc index 24d1bb9cd7..5920d162d1 100644 --- a/data/elementary/themes/edc/elm/radio.edc +++ b/data/elementary/themes/edc/elm/radio.edc @@ -30,13 +30,13 @@ group { name: "elm/radio/base/default"; } rect { "icon_clip"; desc { "default"; - color_class: "button_icon"; + color: 255 255 255 255; } desc { "pressed"; inherit; - color_class: "button_icon_pressed"; + color: 255 255 255 255; } desc { "disabled"; inherit; - color_class: "button_icon_disabled"; + color: 255 255 255 64; } } swallow { "elm.swallow.content"; nomouse; diff --git a/data/elementary/themes/edc/elm/scroller.edc b/data/elementary/themes/edc/elm/scroller.edc index 8d14c72249..d4ba02dcb2 100644 --- a/data/elementary/themes/edc/elm/scroller.edc +++ b/data/elementary/themes/edc/elm/scroller.edc @@ -24,7 +24,6 @@ group { name: "elm/scroller/base/default"; description { state: "default" 0.0; rel.to: "elm.swallow.background"; color: 0 0 0 0; - color_class: "scroller_bg"; } } part { name: "clipper"; type: RECT; diff --git a/data/elementary/themes/edc/elm/uiclock.edc b/data/elementary/themes/edc/elm/uiclock.edc index db444fd215..cc94fceff7 100644 --- a/data/elementary/themes/edc/elm/uiclock.edc +++ b/data/elementary/themes/edc/elm/uiclock.edc @@ -35,7 +35,6 @@ part { \ name: "elm.separator"#_pos; type: TEXT; \ scale: 1; \ - effect: SHADOW BOTTOM; \ clip_to: "disclip"; \ description { state: "default" 0.0; \ visible: 0; \ @@ -50,7 +49,7 @@ relative: 1.0 1.0; \ to: "elm.field"#_after; \ } \ - color_class: "datetime_separator_text"; \ + color: FN_COL_DEFAULT; \ text { \ font: "Sans"; size: 10; \ min: 1 0; \ @@ -68,13 +67,12 @@ part { \ name: "separator"#_pos"d"; type: TEXT; \ scale: 1; \ - effect: SHADOW BOTTOM; \ clip_to: "disclip2"; \ description { state: "default" 0.0; \ visible: 0; \ rel1.to: "elm.separator"#_pos; \ rel2.to: "elm.separator"#_pos; \ - color_class: "datetime_separator_text_disabled"; \ + color: FN_COL_DISABLE; \ text { \ text_source: "elm.separator"#_pos; \ font: "Sans"; size: 10; \ @@ -104,7 +102,7 @@ group { name: "elm/uiclock/base/default"; parts { part { name: "bg"; type: RECT; description { state: "default" 0.0; - color_class: "datetime_bg"; + color: 0 0 0 0; } } part { name: "clip"; type: RECT; diff --git a/data/elementary/themes/edc/entry.edc b/data/elementary/themes/edc/entry.edc index a2ded18e68..a1741cd5fd 100644 --- a/data/elementary/themes/edc/entry.edc +++ b/data/elementary/themes/edc/entry.edc @@ -25,10 +25,10 @@ group { name: "e/widgets/entry/scrollframe"; group { name: "e/widgets/entry/text"; styles { style { name: "entry_textblock_style"; - base: "font="FN" font_size=10 color=#a0a0a0 text_class=entry color_class=entry_text left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#a0a0a0 text_class=entry left_margin=2 right_margin=2"; } style { name: "entry_textblock_disabled_style"; - base: "font="FN" font_size=10 color=#707070 text_class=entry color_class=entry_text_disabled left_margin=2 right_margin=2"; + base: "font="FN" font_size=10 color=#707070 text_class=entry left_margin=2 right_margin=2"; } } parts { @@ -41,7 +41,7 @@ group { name: "e/widgets/entry/text"; source: "e/widgets/entry/selection"; // selection under source4: "e/widgets/entry/cursor"; // cursorover description { state: "default" 0.0; - color_class: "entry_text"; + color: FN_COL_DEFAULT; align: 0.0 0.5; text { style: "entry_textblock_style"; @@ -53,7 +53,7 @@ group { name: "e/widgets/entry/text"; description { state: "disabled" 0.0; inherit: "default" 0.0; text.style: "entry_textblock_disabled_style"; - color_class: "entry_text_disabled"; + color: FN_COL_DISABLE; } } } diff --git a/data/elementary/themes/edc/evrything.edc b/data/elementary/themes/edc/evrything.edc index 8657acec04..69c5ace6c6 100644 --- a/data/elementary/themes/edc/evrything.edc +++ b/data/elementary/themes/edc/evrything.edc @@ -591,7 +591,6 @@ group { name: "e/modules/everything/thumbview/main/scrollframe"; description { state: "default" 0.0; rel.to: "e.swallow.content"; color: 0 0 0 0; - color_class: "scroller_bg"; } } part { name: "clipper"; type: RECT; diff --git a/data/elementary/themes/edc/fontpreview.edc b/data/elementary/themes/edc/fontpreview.edc index 0feba91c5b..8c407535e6 100644 --- a/data/elementary/themes/edc/fontpreview.edc +++ b/data/elementary/themes/edc/fontpreview.edc @@ -3,10 +3,9 @@ group { name: "e/widgets/fontpreview"; part { name: "e.fontpreview.text"; type: TEXT; mouse_events: 0; scale: 1; description { state: "default" 0.0; - color_class: "entry_text"; + color: FN_COL_DEFAULT; rel1.offset: 4 4; rel2.offset: -5 -5; - color: 160 160 160 255; text { font: FN; size: 10; min: 1 1; ellipsis: -1; diff --git a/data/elementary/themes/edc/ilist.edc b/data/elementary/themes/edc/ilist.edc index d415c5cf85..d07fbe4932 100644 --- a/data/elementary/themes/edc/ilist.edc +++ b/data/elementary/themes/edc/ilist.edc @@ -176,13 +176,10 @@ group { name: "e/widgets/ilist_odd"; } part { name: "e.text.label"; description { state: "default" 0.0; -// color_class: "ilist_item_odd"; } description { state: "selected" 0.0; -// color_class: "ilist_item_odd"; } description { state: "disabled" 0.0; -// color_class: "ilist_item_odd"; } } } diff --git a/data/elementary/themes/edc/pager.edc b/data/elementary/themes/edc/pager.edc index 913f9bc580..c9f1059c25 100644 --- a/data/elementary/themes/edc/pager.edc +++ b/data/elementary/themes/edc/pager.edc @@ -72,7 +72,7 @@ group { name: "e/modules/pager/desk"; part { name: "e.text.label"; type: TEXT; mouse_events: 0; desc { "default"; rel.to: "e.swallow.content"; - color3: 255 255 255 255; + color: FN_COL_DEFAULT; text { font: "Sans"; size: 10; text_class: "module_small"; align: 0.5 0.5; @@ -80,7 +80,6 @@ group { name: "e/modules/pager/desk"; visible: 0; } desc { "active"; inherit; - color_class: "module_label"; visible: 1; } } diff --git a/data/elementary/themes/edc/pager16.edc b/data/elementary/themes/edc/pager16.edc index 7af2cbfbe2..53bf38392c 100644 --- a/data/elementary/themes/edc/pager16.edc +++ b/data/elementary/themes/edc/pager16.edc @@ -150,7 +150,7 @@ group { name: "e/modules/pager16/desk"; scale: 1; desc { "default"; rel.to: "e.swallow.content"; - color3: 255 255 255 255; + color: FN_COL_DEFAULT; text { font: "Sans"; size: 10; text_class: "module_small"; align: 0.5 0.5; @@ -158,7 +158,6 @@ group { name: "e/modules/pager16/desk"; visible: 0; } desc { "active"; inherit; - color_class: "module_label"; visible: 1; } } diff --git a/data/elementary/themes/edc/scrollframe.edc b/data/elementary/themes/edc/scrollframe.edc index edb4773234..6e6908df91 100644 --- a/data/elementary/themes/edc/scrollframe.edc +++ b/data/elementary/themes/edc/scrollframe.edc @@ -67,7 +67,6 @@ group { name: "e/widgets/scrollframe"; description { state: "default" 0.0; rel.to: "e.swallow.content"; color: 0 0 0 0; - color_class: "scroller_bg"; } } part { name: "clipper"; type: RECT;