kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm theme - remove color_classes - preparing to redo them

This commit is contained in:
Carsten Haitzler 2021-04-02 01:53:26 +01:00
parent 638b1a7c9b
commit 61d816659c
28 changed files with 63 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/elementary/themes/edc/border.edc
View File

@ -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;

3
data/elementary/themes/edc/comp.edc
View File

@ -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: "";
}
}
}

10
data/elementary/themes/edc/comp_compat.edc
View File

@ -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: "";
}
}
}

4
data/elementary/themes/edc/deskmirror.edc
View File

@ -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;

9
data/elementary/themes/edc/efl/border.edc
View File

@ -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;
}
}

6
data/elementary/themes/edc/efl/button.edc
View File

@ -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;

12
data/elementary/themes/edc/efl/check.edc
View File

@ -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;

6
data/elementary/themes/edc/efl/radio.edc
View File

@ -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;

4
data/elementary/themes/edc/efl/tags.edc
View File

@ -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;

5
data/elementary/themes/edc/elm/border.edc
View File

@ -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;
}
}

6
data/elementary/themes/edc/elm/button.edc
View File

@ -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;

12
data/elementary/themes/edc/elm/check.edc
View File

@ -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;

3
data/elementary/themes/edc/elm/colorclass.edc
View File

@ -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";
}

30
data/elementary/themes/edc/elm/entry.edc
View File

@ -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
}
}

2
data/elementary/themes/edc/elm/multibuttonentry.edc
View File

@ -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;

1
data/elementary/themes/edc/elm/naviframe.edc
View File

@ -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;

2
data/elementary/themes/edc/elm/notify.edc
View File

@ -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";

2
data/elementary/themes/edc/elm/popup.edc
View File

@ -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;
}
}
}

6
data/elementary/themes/edc/elm/radio.edc
View File

@ -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;

1
data/elementary/themes/edc/elm/scroller.edc
View File

@ -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;

8
data/elementary/themes/edc/elm/uiclock.edc
View File

@ -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;

8
data/elementary/themes/edc/entry.edc
View File

@ -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;
}
}
}

1
data/elementary/themes/edc/evrything.edc
View File

@ -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;

3
data/elementary/themes/edc/fontpreview.edc
View File

@ -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;

3
data/elementary/themes/edc/ilist.edc
View File

@ -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";
}
}
}

3
data/elementary/themes/edc/pager.edc
View File

@ -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;
}
}

3
data/elementary/themes/edc/pager16.edc
View File

@ -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;
}
}

1
data/elementary/themes/edc/scrollframe.edc
View File

@ -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;