raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=97ddb9e3e0d0e062705d067d110ff6163d22a46f
commit 97ddb9e3e0d0e062705d067d110ff6163d22a46f Author: Carsten Haitzler <[email protected]> Date: Mon Oct 11 09:38:43 2021 +0100 elm theme - more cc --- data/elementary/themes/edc/efl/calendar.edc | 33 ++++++++++++++--------------- data/elementary/themes/edc/efl/focus.edc | 28 ++++++++++++------------ 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/data/elementary/themes/edc/efl/calendar.edc b/data/elementary/themes/edc/efl/calendar.edc index 79f81c218d..a00cfb81ff 100644 --- a/data/elementary/themes/edc/efl/calendar.edc +++ b/data/elementary/themes/edc/efl/calendar.edc @@ -34,7 +34,7 @@ max: 25 25;\ }\ }\ - part { name: "right_bt"#_sufix; type: RECT;\ + part { name: "right_bt"#_sufix; type: SPACER;\ scale: 1;\ description { state: "default" 0.0;\ fixed: 1 1;\ @@ -47,7 +47,6 @@ align: 1.0 0.5;\ min: 25 25;\ max: 25 25;\ - color: 0 0 0 0;\ }\ }\ part { name: "efl.calendar.button"#_sufix".left"; type: SWALLOW;\ @@ -93,7 +92,7 @@ min: 0 1;\ text_class: "calendar_"#_text; \ }\ - color: 160 160 160 255; \ + color_class: "/fg/normal/calendar/text/title"; \ }\ } @@ -118,7 +117,7 @@ ellipsis: -1; \ text_class: "calendar_weekday_text"; \ } \ - color: 160 160 160 255; \ + color_class: "/fg/normal/calendar/text/day"; \ } \ } \ part { name: "ch_"#_pos"_clipper"; type: RECT; \ @@ -138,17 +137,17 @@ part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \ description { state: "default" 0.0; \ rel.to: "cit_"#_pos"_rect"; \ - color: 0 0 0 0; \ + color_class: "/bg/normal/calendar/day/normal"; \ } \ description { state: "today" 0.0; \ inherit: "default" 0.0; \ - color: 0 0 0 64; \ + color_class: "/bg/normal/calendar/day/today"; \ } \ } \ part { name: "cit_"#_pos"_selected"; type: RECT; mouse_events: 0; \ description { state: "default" 0.0; \ rel.to: "cit_"#_pos"_rect"; \ - color: 51 153 255 128; \ + color_class: "/bg/selected/calendar/day"; \ visible: 0; \ } \ description { state: "selected" 0.0; \ @@ -159,7 +158,7 @@ part { name: "cit_"#_pos"_focus"; type: RECT; mouse_events: 0; \ description { state: "default" 0.0; \ rel.to: "cit_"#_pos"_rect"; \ - color: 255 153 51 128; \ + color_class: "/bg/selected/calendar/day/focused"; \ visible: 0; \ } \ description { state: "selected" 0.0; \ @@ -209,7 +208,7 @@ max: 15 15; \ align: 0.0 1.0;\ image.normal: "i-check"; \ - color: 53 153 255 255; \ + color_class: "/fg/normal/calendar/day/checked"; \ visible: 0; \ } \ description { state: "visible" 0.0; \ @@ -220,7 +219,7 @@ part { name: "efl.cit_"#_pos".access"; type: RECT; repeat_events: 1; \ description { state: "default" 0.0; \ rel.to: "cit_"#_pos"_event"; \ - color: 0 0 0 0; \ + color: 0 0 0 0; /* no cc */ \ } \ } \ programs { \ @@ -452,7 +451,7 @@ group { name: "efl/calendar"; rel1.relative: 0.0 1.0; rel1.offset: 8 -1; rel2.offset: -9 -1; - color: 80 80 80 255; + color_class: "/fg/normal/separator"; offscale; } } @@ -512,28 +511,28 @@ group { name: "efl/calendar/inc_button"; part { name: "arrow.image"; scale: 1; description { state: "default" 0.0; - min: 15 15; max: 15 15; - color: 160 160 160 255; + FIXED_SIZE(15, 15) + color_class: "/fg/normal/spinner/arrow"; image.normal: "i-arrow-r"; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/spinner/arrow"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 96 96 96 255; + color_class: "/fg/disabled/spinner/arrow"; } } part { name: "over"; type: RECT; repeat_events: 1; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } part { name: "disabler"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } description { state: "disabled" 0.0; diff --git a/data/elementary/themes/edc/efl/focus.edc b/data/elementary/themes/edc/efl/focus.edc index d135632570..8b326d4228 100644 --- a/data/elementary/themes/edc/efl/focus.edc +++ b/data/elementary/themes/edc/efl/focus.edc @@ -88,12 +88,12 @@ group { name: "efl/focus_highlight/top"; rel1.offset: -999 -999; rel2.relative: 2.0 2.0; rel2.offset: 999 999; - color: 255 255 255 0; + color: 255 255 255 0; // no cc visible: 0; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc visible: 1; } } @@ -102,13 +102,13 @@ group { name: "efl/focus_highlight/top"; scale: 1; description { state: "default" 0.0; rel.to: "base"; - color: 51 153 255 255; + color_class: "/bg/selected/focus"; rel2.relative: 1.0 0.0; min: 4 4; } description { state: "hi" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/bg/selected/focus/hilight"; } } part { name: "topl"; type: RECT; @@ -116,7 +116,7 @@ group { name: "efl/focus_highlight/top"; scale: 1; description { state: "default" 0.0; rel.to: "top"; - color: 51 153 255 255; + color_class: "/bg/selected/focus"; rel1.relative: 0.0 1.0; rel2.relative: 0.0 1.0; align: 0.0 0.0; @@ -124,7 +124,7 @@ group { name: "efl/focus_highlight/top"; } description { state: "hi" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/bg/selected/focus/hilight"; } } part { name: "topr"; type: RECT; @@ -132,7 +132,7 @@ group { name: "efl/focus_highlight/top"; scale: 1; description { state: "default" 0.0; rel.to: "top"; - color: 51 153 255 255; + color_class: "/bg/selected/focus"; rel1.relative: 1.0 1.0; rel2.relative: 1.0 1.0; align: 1.0 0.0; @@ -140,7 +140,7 @@ group { name: "efl/focus_highlight/top"; } description { state: "hi" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/bg/selected/focus/hilight"; } } part { name: "bot"; type: RECT; @@ -148,13 +148,13 @@ group { name: "efl/focus_highlight/top"; scale: 1; description { state: "default" 0.0; rel.to: "base"; - color: 51 153 255 255; + color_class: "/bg/selected/focus"; rel1.relative: 0.0 1.0; min: 4 4; } description { state: "hi" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/bg/selected/focus/hilight"; } } part { name: "botl"; type: RECT; @@ -162,7 +162,7 @@ group { name: "efl/focus_highlight/top"; scale: 1; description { state: "default" 0.0; rel.to: "bot"; - color: 51 153 255 255; + color_class: "/bg/selected/focus"; rel1.relative: 0.0 0.0; rel2.relative: 0.0 0.0; align: 0.0 1.0; @@ -170,7 +170,7 @@ group { name: "efl/focus_highlight/top"; } description { state: "hi" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/bg/selected/focus/hilight"; } } part { name: "botr"; type: RECT; @@ -178,7 +178,7 @@ group { name: "efl/focus_highlight/top"; scale: 1; description { state: "default" 0.0; rel.to: "bot"; - color: 51 153 255 255; + color_class: "/bg/selected/focus"; rel1.relative: 1.0 0.0; rel2.relative: 1.0 0.0; align: 1.0 1.0; @@ -186,7 +186,7 @@ group { name: "efl/focus_highlight/top"; } description { state: "hi" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/bg/selected/focus/hilight"; } } } --
