aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Lees <simon@simotek.net>2014-03-05 15:55:26 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-05 16:01:19 +0900
commit5003400f9ecb466aea951aa885f5729e101136df (patch)
tree064a8e2b71706b5c629bff23decd613c3f3df54a
parentnaviframe: Emit visible signal to edc theme when first item is pushed (diff)
downloadelementary-5003400f9ecb466aea951aa885f5729e101136df.tar.gz
Enhancement: #define names for text colors
Summary: Previously text colors were specfied in the form color: XXX XXX XXX AAA throughout all the edc files, eg color: 255 255 255 255 this made it imposible to write a script to change text colors with sed as it changed many other parts of the theme as well. Some colors had been defined in fonts.edc and in some places these were used but not many. This change means that all non textblock font colors are defined in fonts.edc and the defined names are used throughout the entire code base. This means that sed only needs to be run on 1 file to change the text color or it is easy to do manually textblock colors were not done for 2 reasons 1. They hadn't been done in the past so there was no standard for me to follow. 2. They are all specified in html notation eg #FFFFFF which means that they can be changed with sed without effecting the rest of the theme. If a standard can be come up with for doing this and people think it is worthwhile i can probably fix them at a later date Reviewers: raster, zmike Reviewed By: raster CC: seoz Differential Revision: https://phab.enlightenment.org/D577 Conflicts: data/themes/edc/battery.edc data/themes/edc/xkbswitch.edc
-rw-r--r--data/themes/edc/about-e.edc3
-rw-r--r--data/themes/edc/about-theme.edc14
-rw-r--r--data/themes/edc/appmenu.edc7
-rw-r--r--data/themes/edc/battery.edc10
-rw-r--r--data/themes/edc/border.edc9
-rw-r--r--data/themes/edc/button.edc9
-rw-r--r--data/themes/edc/check.edc9
-rw-r--r--data/themes/edc/clock.edc25
-rw-r--r--data/themes/edc/colors.edc6
-rw-r--r--data/themes/edc/comp.edc3
-rw-r--r--data/themes/edc/desklock.edc12
-rw-r--r--data/themes/edc/deskmirror.edc6
-rw-r--r--data/themes/edc/edgebindings.edc3
-rw-r--r--data/themes/edc/elm/border.edc12
-rw-r--r--data/themes/edc/elm/bubble.edc24
-rw-r--r--data/themes/edc/elm/button.edc36
-rw-r--r--data/themes/edc/elm/calendar.edc3
-rw-r--r--data/themes/edc/elm/check.edc32
-rw-r--r--data/themes/edc/elm/datetime.edc6
-rw-r--r--data/themes/edc/elm/diskselector.edc16
-rw-r--r--data/themes/edc/elm/flipselector.edc12
-rw-r--r--data/themes/edc/elm/frame.edc3
-rw-r--r--data/themes/edc/elm/gengrid.edc30
-rw-r--r--data/themes/edc/elm/genlist.edc186
-rw-r--r--data/themes/edc/elm/layout.edc9
-rw-r--r--data/themes/edc/elm/list.edc20
-rw-r--r--data/themes/edc/elm/map.edc9
-rw-r--r--data/themes/edc/elm/menu.edc14
-rw-r--r--data/themes/edc/elm/multibuttonentry.edc7
-rw-r--r--data/themes/edc/elm/naviframe.edc15
-rw-r--r--data/themes/edc/elm/progress.edc20
-rw-r--r--data/themes/edc/elm/radio.edc6
-rw-r--r--data/themes/edc/elm/segment_control.edc7
-rw-r--r--data/themes/edc/elm/slider.edc30
-rw-r--r--data/themes/edc/elm/toolbar.edc30
-rw-r--r--data/themes/edc/evrything.edc42
-rw-r--r--data/themes/edc/fileman.edc26
-rw-r--r--data/themes/edc/fontpreview.edc3
-rw-r--r--data/themes/edc/frame.edc3
-rw-r--r--data/themes/edc/ibar-ibox.edc13
-rw-r--r--data/themes/edc/ilist.edc16
-rw-r--r--data/themes/edc/init.edc11
-rw-r--r--data/themes/edc/label.edc6
-rw-r--r--data/themes/edc/menu.edc13
-rw-r--r--data/themes/edc/notification.edc3
-rw-r--r--data/themes/edc/packagekit.edc3
-rw-r--r--data/themes/edc/pager.edc6
-rw-r--r--data/themes/edc/pager16.edc6
-rw-r--r--data/themes/edc/radio.edc9
-rw-r--r--data/themes/edc/slider.edc12
-rw-r--r--data/themes/edc/syscon.edc9
-rw-r--r--data/themes/edc/tasks.edc14
-rw-r--r--data/themes/edc/temperature.edc7
-rw-r--r--data/themes/edc/toolbar.edc7
-rw-r--r--data/themes/edc/winlist.edc16
-rw-r--r--data/themes/edc/wizard.edc10
-rw-r--r--data/themes/edc/xkbswitch.edc11
-rw-r--r--data/themes/fonts.edc33
58 files changed, 313 insertions, 609 deletions
diff --git a/data/themes/edc/about-e.edc b/data/themes/edc/about-e.edc
index ef1c14fdd..5e98f55be 100644
--- a/data/themes/edc/about-e.edc
+++ b/data/themes/edc/about-e.edc
@@ -215,8 +215,7 @@ group { name: "e/widgets/about/main";
rel1.relative: 0.5 1.0;
rel2.offset: -1 -14;
rel2.relative: 0.5 1.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "button_text";
align: 0.5 1.0;
text { font: FN; size: 10;
diff --git a/data/themes/edc/about-theme.edc b/data/themes/edc/about-theme.edc
index 13fee85d0..70c0127bc 100644
--- a/data/themes/edc/about-theme.edc
+++ b/data/themes/edc/about-theme.edc
@@ -27,9 +27,7 @@ group { name: "e/theme/about";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
rel1.relative: 0.5 0.5;
rel2.relative: 0.5 0.5;
text { font: FNBD; size: 64;
@@ -44,9 +42,7 @@ group { name: "e/theme/about";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
rel1.relative: 0.5 0.9;
rel1.to: "name";
rel2.relative: 0.5 0.9;
@@ -100,8 +96,7 @@ group { name: "e/theme/about";
rel1.relative: 1.0 1.0;
rel2.offset: -14 -14;
rel2.relative: 1.0 1.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "button_text";
align: 1.0 1.0;
min: 85 0;
@@ -138,8 +133,7 @@ group { name: "e/theme/about";
rel1.relative: 0.0 1.0;
rel2.offset: 13 -14;
rel2.relative: 0.0 1.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "button_text";
align: 0.0 1.0;
min: 85 0;
diff --git a/data/themes/edc/appmenu.edc b/data/themes/edc/appmenu.edc
index 80cdc8dda..37fef8713 100644
--- a/data/themes/edc/appmenu.edc
+++ b/data/themes/edc/appmenu.edc
@@ -39,8 +39,7 @@ group { name: "e/modules/appmenu/item";
state: "default" 0.0;
rel1.offset: 2 2;
rel2.offset: -3 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text {
font: FN;
size: 10;
@@ -52,9 +51,7 @@ group { name: "e/modules/appmenu/item";
description {
state: "selected" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
}
}
}
diff --git a/data/themes/edc/battery.edc b/data/themes/edc/battery.edc
index e04514ed6..f8b164aea 100644
--- a/data/themes/edc/battery.edc
+++ b/data/themes/edc/battery.edc
@@ -221,7 +221,7 @@ group { name: "e/modules/battery/main";
rel2.to_x: "bg";
rel2.to_y: "pwr";
rel2.offset: -1 2;
- color: 255 255 255 255;
+ color: FN_COL_DEFAULT_BASIC;
color_class: "module_label";
text { font: "Sans"; size: 8;
min: 0 1;
@@ -240,7 +240,7 @@ group { name: "e/modules/battery/main";
rel1.to_y: "pwr";
rel2.offset: -1 1;
rel2.to: "bg";
- color: 255 255 255 255;
+ color: FN_COL_DEFAULT_BASIC;
color_class: "module_label";
text { font: "Sans"; size: 8;
min: 0 1;
@@ -322,8 +322,7 @@ group { name: "e/modules/battery/popup";
rel1.relative: 1.0 0.0;
rel1.to_x: "e.swallow.battery";
rel2.relative: 1.0 0.5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: "Sans:style=Bold"; size: 10;
text: "Your battery is low!";
min: 1 1;
@@ -337,8 +336,7 @@ group { name: "e/modules/battery/popup";
description { state: "default" 0.0;
rel1.relative: 1.0 0.5;
rel1.to_x: "e.swallow.battery";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: "Sans"; size: 10;
text: "AC power is recommended.";
min: 1 1;
diff --git a/data/themes/edc/border.edc b/data/themes/edc/border.edc
index fedba2e23..f4156863f 100644
--- a/data/themes/edc/border.edc
+++ b/data/themes/edc/border.edc
@@ -113,8 +113,7 @@ group { name: "e/widgets/border/default/border";
rel2.offset: -2 3;
rel2.to_x: "e.event.minimize";
align: 0.5 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.0;
@@ -139,8 +138,7 @@ group { name: "e/widgets/border/default/border";
rel2.offset: -1 2;
rel2.to_x: "e.event.minimize";
align: 0.5 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 18;
+ color: FN_COL_DEFAULT_SOFT_SHADOW;
text { font: FNBD; size: 10;
text_source: "e.text.title";
text_class: "title_bar";
@@ -1240,8 +1238,7 @@ group { name: "e/widgets/border/default/move";
rel1.offset: 4 4;
rel1.relative: 1.0 0.0;
rel2.offset: -5 -5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "move_text";
text { font: FN; size: 10;
min: 1 1;
diff --git a/data/themes/edc/button.edc b/data/themes/edc/button.edc
index 8369efe7b..69258c1db 100644
--- a/data/themes/edc/button.edc
+++ b/data/themes/edc/button.edc
@@ -67,8 +67,7 @@
rel1.to_y: "base";
rel2.offset: -7 -7;
rel2.to: "base";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "button_text";
text { font: FN; size: 10;
min: 1 1;
@@ -78,8 +77,7 @@
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "button_text_disabled";
}
description { state: "combo" 0.0;
@@ -99,8 +97,7 @@
description { state: "default" 0.0;
rel1.to: "e.text.label";
rel2.to: "e.text.label";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "button_text_disabled";
text { font: FN; size: 10;
text_source: "e.text.label";
diff --git a/data/themes/edc/check.edc b/data/themes/edc/check.edc
index 59ab0a088..bdd1b6cbb 100644
--- a/data/themes/edc/check.edc
+++ b/data/themes/edc/check.edc
@@ -73,8 +73,7 @@ group { name: "e/widgets/check";
rel1.to_x: "inset";
rel1.relative: 1.0 0.0;
rel2.offset: -3 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "check_text";
text { font: FN; size: 10;
min: 1 1;
@@ -84,8 +83,7 @@ group { name: "e/widgets/check";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
}
}
part { name: "event"; type: RECT;
@@ -158,8 +156,7 @@ group { name: "e/widgets/check_icon";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
}
}
}
diff --git a/data/themes/edc/clock.edc b/data/themes/edc/clock.edc
index e0f5b166f..22c35b2b4 100644
--- a/data/themes/edc/clock.edc
+++ b/data/themes/edc/clock.edc
@@ -420,9 +420,7 @@ group { name: "e/modules/clock/digital";
rel1.offset: 0 1;
rel2.offset: -1 1;
align: 0.5 1.0;
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
text { font: FN; size: 8;
text_class: "module_small";
align: 0.5 0.5;
@@ -813,8 +811,7 @@ group { name: "e/modules/clock/calendar/dayname";
effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
text { font: FN; size: 8;
text: "WWe";
min: 1 1;
@@ -875,8 +872,7 @@ group { name: "e/modules/clock/calendar/day";
effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FN; size: 10;
text: "00";
min: 1 1;
@@ -889,12 +885,11 @@ group { name: "e/modules/clock/calendar/day";
}
description { state: "weekend" 0.0;
inherit: "default" 0.0;
- color: 128 128 128 255;
+ color: FN_COL_MID_GREY;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
}
}
part { name: "label2"; type: TEXT; mouse_events: 0;
@@ -905,9 +900,7 @@ group { name: "e/modules/clock/calendar/day";
rel1.to: "e.text.label";
rel2.offset: 2 1;
rel2.to: "e.text.label";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
text { font: FN; size: 10;
text_source: "e.text.label";
min: 1 1;
@@ -992,8 +985,7 @@ group { name: "e/modules/clock/calendar";
rel1.to_x: "prev";
rel1.relative: 1.0 0.0;
rel2.relative: 1.0 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 10;
text: "000000000000";
align: 0.0 0.5;
@@ -1011,8 +1003,7 @@ group { name: "e/modules/clock/calendar";
rel1.relative: 0.0 0.0;
rel2.to_x: "next";
rel2.relative: 0.0 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 10;
text: "0000";
align: 1.0 0.5;
diff --git a/data/themes/edc/colors.edc b/data/themes/edc/colors.edc
index d980a671e..47b516272 100644
--- a/data/themes/edc/colors.edc
+++ b/data/themes/edc/colors.edc
@@ -57,7 +57,7 @@ group { name: "e/modules/conf_colors/preview/text";
parts {
part { name: "shadow"; type: TEXT; mouse_events: 0;
description { state: "default" 0.0;
- color: 255 255 255 32;
+ color: FN_COL_SHADOW;
text { font: FN; size: 10;
text: "Text";
min: 1 1;
@@ -67,9 +67,7 @@ group { name: "e/modules/conf_colors/preview/text";
part { name: "e.text"; type: TEXT; mouse_events: 0;
effect: OUTLINE_SHADOW;
description { state: "default" 0.0;
- color: 255 255 255 255;
- color2: 255 255 255 255;
- color3: 255 255 255 255;
+ color: FN_COL_OUTLINE_SHADOW;
color_class: "color_preview";
text { font: FNBD; size: 16;
text: "Ab";
diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc
index 23bb0f5ae..796f0be06 100644
--- a/data/themes/edc/comp.edc
+++ b/data/themes/edc/comp.edc
@@ -8,8 +8,7 @@ group { name: "e/comp/preview";
scale: 1;
effect: SHADOW BOTTOM;
description { state: "default" 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 10;
text_class: "fileman_icon";
align: 0.5 0.5;
diff --git a/data/themes/edc/desklock.edc b/data/themes/edc/desklock.edc
index 687a2b4fa..1b521485f 100644
--- a/data/themes/edc/desklock.edc
+++ b/data/themes/edc/desklock.edc
@@ -85,8 +85,7 @@ group { name: "e/desklock/login_box";
rel2.relative: 1.0 1.0;
rel2.offset: -4 3;
rel2.to_y: "logo";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
align: 0.5 0.0;
text { font: FNBD; size: 10;
min: 0 1;
@@ -121,8 +120,7 @@ group { name: "e/desklock/login_box";
rel2.offset: 3 10;
rel2.to_x: "inset";
rel2.to_y: "e.text.title";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "desklock_passwd";
align: 0.0 0.0;
text { font: FN; size: 10;
@@ -326,8 +324,7 @@ group { name: "e/desklock/pin_box";
rel1.relative: 0.0 1.0;
rel1.to_y: "e.swallow.buttons";
rel2.offset: -4 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
align: 0.5 0.0;
text { font: "Sans:style=Bold"; size: 10;
min: 0 1;
@@ -358,8 +355,7 @@ group { name: "e/desklock/pin_box";
rel1.offset: 3 2;
rel2.relative: 0.5 0.0;
rel2.offset: 3 -2;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "desklock_passwd";
text { font: "Sans"; size: 10;
min: 1 1;
diff --git a/data/themes/edc/deskmirror.edc b/data/themes/edc/deskmirror.edc
index d46402cce..ec96663a0 100644
--- a/data/themes/edc/deskmirror.edc
+++ b/data/themes/edc/deskmirror.edc
@@ -106,8 +106,7 @@ group { name: "e/deskmirror/frame/default";
rel2.offset: -2 3;
rel2.to: "spacer";
align: 0.5 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.0;
@@ -128,8 +127,7 @@ group { name: "e/deskmirror/frame/default";
rel2.offset: -1 2;
rel2.to: "spacer";
align: 0.5 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 18;
+ color: FN_COL_DEFAULT_SOFT_SHADOW;
text { font: FNBD; size: 10;
text_source: "e.text.title";
text_class: "title_bar";
diff --git a/data/themes/edc/edgebindings.edc b/data/themes/edc/edgebindings.edc
index 1a6b8c01d..33228db2f 100644
--- a/data/themes/edc/edgebindings.edc
+++ b/data/themes/edc/edgebindings.edc
@@ -62,8 +62,7 @@ group { name: "e/modules/conf_edgebindings/selection";
rel1.to: "e.swallow.background";
rel2.relative: 0.5 0.5;
rel2.to: "e.swallow.background";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "label_text";
fixed: 1 1;
text { font: FN; size: 10;
diff --git a/data/themes/edc/elm/border.edc b/data/themes/edc/elm/border.edc
index 7af91f7fb..81e5d2b4d 100644
--- a/data/themes/edc/elm/border.edc
+++ b/data/themes/edc/elm/border.edc
@@ -114,8 +114,7 @@ group { name: "elm/ews/decoration/default";
rel2.offset: -2 -3;
rel2.to_x: "e.event.minimize";
align: 0.5 1.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.0;
@@ -140,8 +139,7 @@ group { name: "elm/ews/decoration/default";
rel2.offset: -1 2;
rel2.to_x: "e.event.minimize";
align: 0.5 1.0;
- color: 255 255 255 255;
- color3: 0 0 0 18;
+ color: FN_COL_DEFAULT_SOFT_SHADOW;
text { font: FNBD; size: 10;
text_source: "elm.text.title";
text_class: "title_bar";
@@ -929,8 +927,7 @@ group { name: "elm/border/base/default";
rel2.to_x: "e.event.minimize";
rel2.to_y: "frame";
align: 0.5 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.0;
@@ -957,8 +954,7 @@ group { name: "elm/border/base/default";
rel2.to_x: "e.event.minimize";
rel2.to_y: "frame";
align: 0.5 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 18;
+ color: FN_COL_DEFAULT_SOFT_SHADOW;
text { font: FNBD; size: 10;
text_source: "elm.text.title";
text_class: "title_bar";
diff --git a/data/themes/edc/elm/bubble.edc b/data/themes/edc/elm/bubble.edc
index 379b66100..79a09b7db 100644
--- a/data/themes/edc/elm/bubble.edc
+++ b/data/themes/edc/elm/bubble.edc
@@ -64,8 +64,7 @@ group { name: "elm/bubble/top_left/default";
relative: 0.0 0.0;
offset: -3 2;
}
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "bubble_text";
text { font: FNBD; size: 10;
min: 0 1;
@@ -85,8 +84,7 @@ group { name: "elm/bubble/top_left/default";
rel1.offset: -3 2;
rel2.relative: 1.0 0.0;
rel2.offset: -3 2;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "bubble_info";
text { font: FNBD; size: 10;
min: 1 1;
@@ -249,8 +247,7 @@ group { name: "elm/bubble/top_right/default";
relative: 0.0 0.0;
offset: -3 2;
}
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "bubble_text";
text { font: FNBD; size: 10;
min: 0 1;
@@ -271,8 +268,7 @@ group { name: "elm/bubble/top_right/default";
rel2.to_x: "elm.swallow.icon";
rel2.relative: 0.0 0.0;
rel2.offset: -3 2;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "bubble_info";
text { font: FNBD; size: 10;
min: 1 1;
@@ -440,8 +436,7 @@ group { name: "elm/bubble/bottom_left/default";
relative: 0.0 1.0;
offset: -3 -3;
}
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "bubble_text";
text { font: FNBD; size: 10;
min: 0 1;
@@ -461,8 +456,7 @@ group { name: "elm/bubble/bottom_left/default";
rel1.offset: -3 -3;
rel2.relative: 1.0 1.0;
rel2.offset: -3 -3;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "bubble_info";
text { font: FNBD; size: 10;
min: 1 1;
@@ -621,8 +615,7 @@ group { name: "elm/bubble/bottom_right/default";
relative: 0.0 1.0;
offset: -3 -3;
}
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "bubble_text";
text { font: FNBD; size: 10;
min: 0 1;
@@ -643,8 +636,7 @@ group { name: "elm/bubble/bottom_right/default";
rel2.to_x: "elm.swallow.icon";
rel2.relative: 0.0 1.0;
rel2.offset: -3 -3;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "bubble_info";
text { font: FNBD; size: 10;
min: 1 1;
diff --git a/data/themes/edc/elm/button.edc b/data/themes/edc/elm/button.edc
index f3852b726..e665457a5 100644
--- a/data/themes/edc/elm/button.edc
+++ b/data/themes/edc/elm/button.edc
@@ -153,8 +153,7 @@ group { name: "elm/button/base/default";
rel1.to_y: "base";
rel2.offset: -7 -7;
rel2.to: "base";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "button_text";
text { font: FN; size: 10;
align: 0.5 0.5;
@@ -177,16 +176,14 @@ group { name: "elm/button/base/default";
description { state: "disabled_visible" 0.0;
inherit: "default" 0.0;
rel1.offset: 2 5;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "button_text_disabled";
text.min: 1 1;
visible: 1;
}
description { state: "disabled_textonly" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "button_text_disabled";
text.min: 1 1;
visible: 1;
@@ -441,9 +438,7 @@ group { name: "elm/button/base/anchor";
rel1.to_y: "base";
rel2.offset: -1 -1;
rel2.to: "base";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "button_text_anchor";
text { font: FN; size: 10;
align: 0.5 0.5;
@@ -490,9 +485,7 @@ group { name: "elm/button/base/anchor";
fixed: 1 1;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 255 255 255 255;
- color2: 51 153 255 64;
- color3: 51 153 255 32;
+ color: FN_COL_HIGHLIGHT_CLICKED;
color_class: "button_text_anchor";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -822,16 +815,14 @@ group { name: "elm/button/base/hoversel_vertical/default";
description { state: "disabled_visible" 0.0;
inherit: "default" 0.0;
rel1.offset: 2 5;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "hoversel_text_disabled";
text.min: 1 1;
visible: 1;
}
description { state: "disabled_textonly" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "hoversel_text_disabled";
text.min: 1 1;
visible: 1;
@@ -1055,8 +1046,7 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
rel1.to_y: "base";
rel2.offset: -7 -7;
rel2.to: "base";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "button_text";
text { font: FN; size: 10;
align: 0.0 0.5;
@@ -1079,16 +1069,14 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
description { state: "disabled_visible" 0.0;
inherit: "default" 0.0;
rel1.offset: 2 5;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "button_text_disabled";
text.min: 1 1;
visible: 1;
}
description { state: "disabled_textonly" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "button_text_disabled";
text.min: 1 1;
visible: 1;
@@ -1103,9 +1091,7 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
rel1.to: "elm.text";
rel2.offset: 2 1;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "hoversel_item_active";
text { font: FN; size: 10;
text_source: "elm.text";
diff --git a/data/themes/edc/elm/calendar.edc b/data/themes/edc/elm/calendar.edc
index ecced35b2..477a46eb4 100644
--- a/data/themes/edc/elm/calendar.edc
+++ b/data/themes/edc/elm/calendar.edc
@@ -195,8 +195,7 @@
description { state: "default" 0.0; \
rel1.to: "ch_"#_pos".base"; \
rel2.to: "ch_"#_pos".base"; \
- color: 21 21 21 255;\
- color3: 255 255 255 25;\
+ color: FN_COL_DISABLE;\
text { font: FN; size: 8; \
min: 1 1; \
} \
diff --git a/data/themes/edc/elm/check.edc b/data/themes/edc/elm/check.edc
index af03b2e26..2a6ad62ac 100644
--- a/data/themes/edc/elm/check.edc
+++ b/data/themes/edc/elm/check.edc
@@ -195,8 +195,7 @@ group { name: "elm/check/base/default";
rel1.to_x: "elm.swallow.content";
rel1.relative: 1.0 0.0;
rel2.offset: -3 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "check_text";
text { font: FN; size: 10;
min: 0 0;
@@ -206,8 +205,7 @@ group { name: "elm/check/base/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -216,8 +214,7 @@ group { name: "elm/check/base/default";
}
description { state: "disabled_visible" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
visible: 1;
text.min: 1 1;
}
@@ -457,8 +454,7 @@ group { name: "elm/check/base/toggle";
rel1.to: "button";
rel1.relative: 1.0 0.0;
rel2.to: "offrect";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "check_off_text";
text { font: FN; size: 10;
min: 0 1;
@@ -469,8 +465,7 @@ group { name: "elm/check/base/toggle";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
}
}
part { name: "elm.ontext"; type: TEXT; mouse_events: 0;
@@ -484,9 +479,7 @@ group { name: "elm/check/base/toggle";
rel2.to: "button";
rel2.relative: 0.0 1.0;
rel2.offset: -1 -2;
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "check_on_text";
text { font: FN; size: 10;
min: 0 1;
@@ -497,9 +490,7 @@ group { name: "elm/check/base/toggle";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 64;
- color2: 51 153 255 16;
- color3: 51 153 255 8;
+ color: FN_COL_HIGHLIGHT_DISABLE;
}
}
part { name: "shadow"; mouse_events: 0;
@@ -676,8 +667,7 @@ group { name: "elm/check/base/toggle";
rel2.to_x: "tog";
rel2.relative: 0.0 1.0;
rel2.offset: -5 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "check_text";
text { font: FN; size: 10;
min: 0 0;
@@ -687,8 +677,7 @@ group { name: "elm/check/base/toggle";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -697,8 +686,7 @@ group { name: "elm/check/base/toggle";
}
description { state: "disabled_visible" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
visible: 1;
text.min: 1 1;
}
diff --git a/data/themes/edc/elm/datetime.edc b/data/themes/edc/elm/datetime.edc
index d405cc91c..16b5d590f 100644
--- a/data/themes/edc/elm/datetime.edc
+++ b/data/themes/edc/elm/datetime.edc
@@ -49,8 +49,7 @@
relative: 1.0 1.0; \
to: "field"#_after; \
} \
- color: 255 255 255 255; \
- color3: 0 0 0 128; \
+ color: FN_COL_DEFAULT; \
color_class: "datetime_text"; \
text { \
font: "Sans"; size: 10; \
@@ -74,8 +73,7 @@
visible: 0; \
rel1.to: "separator"#_pos; \
rel2.to: "separator"#_pos; \
- color: 21 21 21 255; \
- color3: 255 255 255 25; \
+ color: FN_COL_DISABLE; \
color_class: "datetime_text"; \
text { \
text_source: "separator"#_pos; \
diff --git a/data/themes/edc/elm/diskselector.edc b/data/themes/edc/elm/diskselector.edc
index 72bfbd79e..9ec4c09ac 100644
--- a/data/themes/edc/elm/diskselector.edc
+++ b/data/themes/edc/elm/diskselector.edc
@@ -128,14 +128,14 @@ group { name: "elm/diskselector/item/default";
}
description { state: "left_side" 0.0;
inherit: "default" 0.0;
- color: 127 127 127 255;
+ color: FN_COL_GREY_152;
text.size: 8;
visible: 1;
text.align: 0.2 0.5;
}
description { state: "right_side" 0.0;
inherit: "default" 0.0;
- color: 127 127 127 255;
+ color: FN_COL_GREY_152;
visible: 1;
text.size: 8;
text.align: 0.8 0.5;
@@ -265,7 +265,7 @@ group { name: "elm/diskselector/item/datetime/default";
description { state: "default" 0.0;
min: 10 10;
align: 0.0 0.0;
- color: 172 172 172 255;
+ color: FN_COL_GREY_172;
visible: 1;
text {
font: "Sans,Edje-Vera";
@@ -275,26 +275,26 @@ group { name: "elm/diskselector/item/datetime/default";
}
description { state: "center_sel" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: FN_COL_WHITE;
}
description { state: "left_side" 0.0;
inherit: "default" 0.0;
- color: 152 152 152 255;
+ color: FN_COL_GREY_152;
text.align: 0.2 0.5;
}
description { state: "left_side_sel" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: FN_COL_WHITE;
text.align: 0.2 0.5;
}
description { state: "right_side" 0.0;
inherit: "default" 0.0;
- color: 152 152 152 255;
+ color: FN_COL_GREY_152;
text.align: 0.8 0.5;
}
description { state: "right_side_sel" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: FN_COL_WHITE;
text.align: 0.8 0.5;
}
}
diff --git a/data/themes/edc/elm/flipselector.edc b/data/themes/edc/elm/flipselector.edc
index 9087f678c..e629d1be6 100644
--- a/data/themes/edc/elm/flipselector.edc
+++ b/data/themes/edc/elm/flipselector.edc
@@ -323,13 +323,11 @@ group { name: "elm/flipselector/base/default";
align: 0.5 0.5;
source: "elm.top";
}
- color: 192 192 192 255;
- color3: 0 0 0 128;
+ color: FN_COL_GREY_192;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 16 16 16 255;
- color3: 255 255 255 25;
+ color: FN_COL_GREY_16;
}
}
part { name: "top_shine_prev"; mouse_events: 0;
@@ -367,8 +365,7 @@ group { name: "elm/flipselector/base/default";
min: 1 1;
align: 0.5 0.5;
}
- color: 192 192 192 255;
- color3: 0 0 0 128;
+ color: FN_COL_GREY_192;
}
description { state: "shrink" 0.0;
inherit: "default" 0.0;
@@ -377,8 +374,7 @@ group { name: "elm/flipselector/base/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 16 16 16 255;
- color3: 255 255 255 25;
+ color: FN_COL_GREY_16;
}
}
part { name: "top_shine_cur"; mouse_events: 0;
diff --git a/data/themes/edc/elm/frame.edc b/data/themes/edc/elm/frame.edc
index 42e495a0c..bc2981113 100644
--- a/data/themes/edc/elm/frame.edc
+++ b/data/themes/edc/elm/frame.edc
@@ -69,8 +69,7 @@ group { name: "elm/frame/base/default";
rel2.offset: -2 2;
rel2.to_x: "edge2";
align: 0.0 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
text { font: FNBD; size: 10;
text_class: "frame";
align: 0.0 0.0;
diff --git a/data/themes/edc/elm/gengrid.edc b/data/themes/edc/elm/gengrid.edc
index 4ffce944f..4889b7ddf 100644
--- a/data/themes/edc/elm/gengrid.edc
+++ b/data/themes/edc/elm/gengrid.edc
@@ -175,8 +175,7 @@ group { name: "elm/gengrid/item/default/default";
rel1.offset: 5 -5;
rel2.relative: 1.0 1.0;
rel2.offset: -5 -5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "grid_item";
align: 0.5 1.0;
text { font: FN; size: 10;
@@ -200,8 +199,7 @@ group { name: "elm/gengrid/item/default/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "grid_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -227,9 +225,7 @@ group { name: "elm/gengrid/item/default/default";
rel1.to: "elm.text";
rel2.offset: 1 0;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "grid_item_selected";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -548,8 +544,7 @@ group { name: "elm/gengrid/item/album-preview/default";
rel1.offset: 5 -5;
rel2.relative: 1.0 1.0;
rel2.offset: -5 -5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "grid_item";
align: 0.5 1.0;
text { font: FN; size: 10;
@@ -573,8 +568,7 @@ group { name: "elm/gengrid/item/album-preview/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "grid_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -600,9 +594,7 @@ group { name: "elm/gengrid/item/album-preview/default";
rel1.to: "elm.text";
rel2.offset: 1 0;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "grid_item_selected";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -835,8 +827,7 @@ group { name: "elm/gengrid/item/thumb/default";
rel1.offset: 5 -5;
rel2.relative: 1.0 1.0;
rel2.offset: -5 -5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "grid_item";
align: 0.5 1.0;
text { font: FN; size: 10;
@@ -860,8 +851,7 @@ group { name: "elm/gengrid/item/thumb/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "grid_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -887,9 +877,7 @@ group { name: "elm/gengrid/item/thumb/default";
rel1.to: "elm.text";
rel2.offset: 1 0;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "grid_item_selected";
text { font: FN; size: 10;
text_source: "elm.text";
diff --git a/data/themes/edc/elm/genlist.edc b/data/themes/edc/elm/genlist.edc
index b46ba8821..9066a4dc1 100644
--- a/data/themes/edc/elm/genlist.edc
+++ b/data/themes/edc/elm/genlist.edc
@@ -166,8 +166,7 @@ group { name: "elm/genlist/item/group_index/default";
rel2.offset: -3 -3;
rel2.relative: 0.0 1.0;
rel2.to_x: "elm.swallow.end";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_group_item";
text { font: FNBD; size: 10;
min: 1 1;
@@ -177,8 +176,7 @@ group { name: "elm/genlist/item/group_index/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_group_item_disabled";
}
}
@@ -437,8 +435,7 @@ group { name: "elm/genlist/item/default/default";
rel2.offset: -3 -3;
rel2.relative: 0.0 1.0;
rel2.to_x: "elm.swallow.end";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
text { font: FN; size: 10;
min: 1 1;
@@ -465,8 +462,7 @@ group { name: "elm/genlist/item/default/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -496,9 +492,7 @@ group { name: "elm/genlist/item/default/default";
rel1.to: "elm.text";
rel2.offset: -1 1;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -897,8 +891,7 @@ group { name: "elm/genlist/item/one_icon/default";
rel1.relative: 1.0 0.0;
rel1.to_x: "elm.swallow.icon";
rel2.offset: -3 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
text { font: FN; size: 10;
min: 0 1;
@@ -925,8 +918,7 @@ group { name: "elm/genlist/item/one_icon/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -956,9 +948,7 @@ group { name: "elm/genlist/item/one_icon/default";
rel1.to: "elm.text";
rel2.offset: -1 1;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -1103,8 +1093,7 @@ group { name: "elm/genlist/item/end_icon/default";
rel2.offset: -3 -3;
rel2.relative: 0.0 1.0;
rel2.to_x: "elm.swallow.icon";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
text { font: FN; size: 10;
min: 1 1;
@@ -1131,8 +1120,7 @@ group { name: "elm/genlist/item/end_icon/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -1162,9 +1150,7 @@ group { name: "elm/genlist/item/end_icon/default";
rel1.to: "elm.text";
rel2.offset: -1 1;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -1303,8 +1289,7 @@ group { name: "elm/genlist/item/no_icon/default";
rel1.relative: 1.0 0.0;
rel1.to_x: "elm.swallow.pad";
rel2.offset: -3 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
text { font: FN; size: 10;
min: 1 1;
@@ -1331,8 +1316,7 @@ group { name: "elm/genlist/item/no_icon/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -1362,9 +1346,7 @@ group { name: "elm/genlist/item/no_icon/default";
rel1.to: "elm.text";
rel2.offset: -1 1;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -2018,8 +2000,7 @@ group { name: "elm/genlist/item/icon_top_text_bottom/default";
rel1.to_x: "elm.swallow.pad";
rel1.to_y: "elm.swallow.icon";
rel2.offset: -3 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
text { font: FN; size: 10;
min: 1 1;
@@ -2046,8 +2027,7 @@ group { name: "elm/genlist/item/icon_top_text_bottom/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -2077,9 +2057,7 @@ group { name: "elm/genlist/item/icon_top_text_bottom/default";
rel1.to: "elm.text";
rel2.offset: -1 1;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -2454,8 +2432,7 @@ group { name: "elm/genlist/item/double_label/default";
rel2.relative: 0.0 0.0;
rel2.to_x: "elm.swallow.end";
rel2.to_y: "elm.text.sub";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
align: 0.0 0.0;
text { font: FN; size: 10;
@@ -2483,8 +2460,7 @@ group { name: "elm/genlist/item/double_label/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -2514,9 +2490,7 @@ group { name: "elm/genlist/item/double_label/default";
rel1.to: "elm.text";
rel2.offset: -1 1;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -2561,8 +2535,7 @@ group { name: "elm/genlist/item/double_label/default";
rel2.offset: -3 -3;
rel2.relative: 0.0 1.0;
rel2.to_x: "elm.swallow.end";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item_sub";
align: 0.0 1.0;
text { font: FN; size: 8;
@@ -2590,8 +2563,7 @@ group { name: "elm/genlist/item/double_label/default";
description { state: "default" 0.0;
rel1.to: "elm.text.sub";
rel2.to: "elm.text.sub";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_sub_disabled";
text { font: FN; size: 8;
text_source: "elm.text.sub";
@@ -2621,9 +2593,7 @@ group { name: "elm/genlist/item/double_label/default";
rel1.to: "elm.text.sub";
rel2.offset: -1 0;
rel2.to: "elm.text.sub";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_sub_selected";
text { font: FN; size: 8;
text_source: "elm.text.sub";
@@ -3084,8 +3054,7 @@ group { name: "elm/genlist/item/message/default";
rel1.to_x: "elm.swallow.pad";
rel2.offset: -3 2;
rel2.relative: 1.0 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
align: 0.0 0.0;
text { font: FN; size: 10;
@@ -3115,8 +3084,7 @@ group { name: "elm/genlist/item/message/default";
fixed: 1 1;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -3147,9 +3115,7 @@ group { name: "elm/genlist/item/message/default";
rel1.to: "elm.text";
rel2.offset: -1 1;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -3195,8 +3161,7 @@ group { name: "elm/genlist/item/message/default";
rel2.offset: -3 -3;
rel2.relative: 1.0 0.0;
rel2.to_y: "elm.title.2";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
text { font: FN; size: 10;
min: 1 1;
@@ -3223,8 +3188,7 @@ group { name: "elm/genlist/item/message/default";
description { state: "default" 0.0;
rel1.to: "elm.title.1";
rel2.to: "elm.title.1";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.title.1";
@@ -3254,9 +3218,7 @@ group { name: "elm/genlist/item/message/default";
rel1.to: "elm.title.1";
rel2.offset: -1 1;
rel2.to: "elm.title.1";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.title.1";
@@ -3287,8 +3249,7 @@ group { name: "elm/genlist/item/message/default";
rel1.relative: 1.0 1.0;
rel1.to_x: "elm.swallow.pad";
rel2.offset: -3 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
align: 0.0 1.0;
text { font: FN; size: 10;
@@ -3317,8 +3278,7 @@ group { name: "elm/genlist/item/message/default";
description { state: "default" 0.0;
rel1.to: "elm.title.2";
rel2.to: "elm.title.2";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.title.2";
@@ -3348,9 +3308,7 @@ group { name: "elm/genlist/item/message/default";
rel1.to: "elm.title.2";
rel2.offset: -1 2;
rel2.to: "elm.title.2";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.title.2";
@@ -3491,8 +3449,7 @@ group { name: "elm/genlist/item/media/default";
rel2.offset: -3 -3;
rel2.relative: 1.0 0.0;
rel2.to_y: "elm.text.album-artist";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
align: 0.0 0.0;
text { font: FN; size: 10;
@@ -3520,8 +3477,7 @@ group { name: "elm/genlist/item/media/default";
description { state: "default" 0.0;
rel1.to: "elm.text.title";
rel2.to: "elm.text.title";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text.title";
@@ -3551,9 +3507,7 @@ group { name: "elm/genlist/item/media/default";
rel1.to: "elm.text.title";
rel2.offset: -1 1;
rel2.to: "elm.text.title";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text.title";
@@ -3597,8 +3551,7 @@ group { name: "elm/genlist/item/media/default";
rel1.to_x: "elm.swallow.pad";
rel2.offset: -3 -3;
rel2.relative: 1.0 1.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item_sub";
align: 0.0 1.0;
text { font: FN; size: 8;
@@ -3626,8 +3579,7 @@ group { name: "elm/genlist/item/media/default";
description { state: "default" 0.0;
rel1.to: "elm.text.album-artist";
rel2.to: "elm.text.album-artist";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_sub_disabled";
text { font: FN; size: 8;
text_source: "elm.text.album-artist";
@@ -3657,9 +3609,7 @@ group { name: "elm/genlist/item/media/default";
rel1.to: "elm.text.album-artist";
rel2.offset: -1 0;
rel2.to: "elm.text.album-artist";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_sub_selected";
text { font: FN; size: 8;
text_source: "elm.text.album-artist";
@@ -3969,8 +3919,7 @@ group { name: "elm/genlist/item/media-album/default";
rel2.relative: 1.0 0.0;
rel2.to_x: "elm.swallow.pad";
rel2.to_y: "elm.text.length";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
align: 0.0 0.0;
text { font: FN; size: 10;
@@ -3999,8 +3948,7 @@ group { name: "elm/genlist/item/media-album/default";
description { state: "default" 0.0;
rel1.to: "elm.text.trackno";
rel2.to: "elm.text.trackno";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text.trackno";
@@ -4030,9 +3978,7 @@ group { name: "elm/genlist/item/media-album/default";
rel1.to: "elm.text.trackno";
rel2.offset: -1 1;
rel2.to: "elm.text.trackno";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text.trackno";
@@ -4098,8 +4044,7 @@ group { name: "elm/genlist/item/media-album/default";
rel2.offset: -3 -1;
rel2.relative: 1.0 1.0;
rel2.to_y: "elm.text.trackno";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
align: 0.0 0.0;
text { font: FN; size: 10;
@@ -4127,8 +4072,7 @@ group { name: "elm/genlist/item/media-album/default";
description { state: "default" 0.0;
rel1.to: "elm.text.title";
rel2.to: "elm.text.title";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text.title";
@@ -4158,9 +4102,7 @@ group { name: "elm/genlist/item/media-album/default";
rel1.to: "elm.text.title";
rel2.offset: -1 1;
rel2.to: "elm.text.title";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text.title";
@@ -4193,8 +4135,7 @@ group { name: "elm/genlist/item/media-album/default";
rel1.to_x: "elm.swallow.pad";
rel2.offset: -3 -3;
rel2.relative: 1.0 1.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item_sub";
align: 0.0 1.0;
text { font: FN; size: 8;
@@ -4222,8 +4163,7 @@ group { name: "elm/genlist/item/media-album/default";
description { state: "default" 0.0;
rel1.to: "elm.text.length";
rel2.to: "elm.text.length";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_sub_disabled";
text { font: FN; size: 8;
text_source: "elm.text.length";
@@ -4253,9 +4193,7 @@ group { name: "elm/genlist/item/media-album/default";
rel1.to: "elm.text.length";
rel2.offset: -1 0;
rel2.to: "elm.text.length";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_sub_selected";
text { font: FN; size: 8;
text_source: "elm.text.length";
@@ -4573,8 +4511,7 @@ group { name: "elm/genlist/item/media-preview/default";
rel2.offset: -3 -3;
rel2.relative: 1.0 0.0;
rel2.to_y: "elm.text.artist";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
align: 0.0 0.0;
text { font: FN; size: 10;
@@ -4602,8 +4539,7 @@ group { name: "elm/genlist/item/media-preview/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -4633,9 +4569,7 @@ group { name: "elm/genlist/item/media-preview/default";
rel1.to: "elm.text";
rel2.offset: -1 1;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -4679,8 +4613,7 @@ group { name: "elm/genlist/item/media-preview/default";
rel1.to_x: "elm.swallow.preview";
rel2.offset: -3 -3;
rel2.relative: 1.0 1.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item_sub";
align: 0.0 1.0;
text { font: FN; size: 8;
@@ -4708,8 +4641,7 @@ group { name: "elm/genlist/item/media-preview/default";
description { state: "default" 0.0;
rel1.to: "elm.text.artist";
rel2.to: "elm.text.artist";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_sub_disabled";
text { font: FN; size: 8;
text_source: "elm.text.artist";
@@ -4739,9 +4671,7 @@ group { name: "elm/genlist/item/media-preview/default";
rel1.to: "elm.text.artist";
rel2.offset: -1 0;
rel2.to: "elm.text.artist";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_sub_selected";
text { font: FN; size: 8;
text_source: "elm.text.artist";
@@ -5168,8 +5098,7 @@ group { name: "elm/genlist/item/mode/default";
rel1.relative: 1.0 0.0;
rel1.to_x: "elm.swallow.pad";
rel2.offset: -3 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
text { font: FN; size: 10;
min: 1 1;
@@ -5196,8 +5125,7 @@ group { name: "elm/genlist/item/mode/default";
description { state: "default" 0.0;
rel1.to: "elm.text.mode";
rel2.to: "elm.text.mode";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text.mode";
@@ -5227,9 +5155,7 @@ group { name: "elm/genlist/item/mode/default";
rel1.to: "elm.text.mode";
rel2.offset: -1 1;
rel2.to: "elm.text.mode";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text.mode";
diff --git a/data/themes/edc/elm/layout.edc b/data/themes/edc/elm/layout.edc
index 902d82bcc..a2e0fec9e 100644
--- a/data/themes/edc/elm/layout.edc
+++ b/data/themes/edc/elm/layout.edc
@@ -105,8 +105,7 @@ group { name: "elm/layout/application/content-back";
relative: 0.0 1.0;
offset: -3 -1;
}
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 10;
}
}
@@ -247,8 +246,7 @@ group { name: "elm/layout/application/content-back-next";
relative: 0.0 1.0;
offset: -3 -1;
}
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 10;
}
}
@@ -524,8 +522,7 @@ group { name: "elm/layout/application/titlebar";
to: "elm.swallow.end";
relative: 0.0 1.0;
}
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 10;
}
}
diff --git a/data/themes/edc/elm/list.edc b/data/themes/edc/elm/list.edc
index 0932ca66d..b05038a9b 100644
--- a/data/themes/edc/elm/list.edc
+++ b/data/themes/edc/elm/list.edc
@@ -216,8 +216,7 @@ group { name: "elm/list/item/default";
rel2.offset: -3 -3;
rel2.relative: 0.0 1.0;
rel2.to_x: "elm.swallow.end";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
text { font: FN; size: 10;
min: 1 1;
@@ -240,8 +239,7 @@ group { name: "elm/list/item/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -267,9 +265,7 @@ group { name: "elm/list/item/default";
rel1.to: "elm.text";
rel2.offset: 1 1;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -530,8 +526,7 @@ group { name: "elm/list/h_item/default";
rel2.offset: -3 -3;
rel2.relative: 1.0 0.0;
rel2.to_y: "elm.swallow.end";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "list_item";
text { font: FN; size: 10;
min: 1 1;
@@ -554,8 +549,7 @@ group { name: "elm/list/h_item/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "list_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -581,9 +575,7 @@ group { name: "elm/list/h_item/default";
rel1.to: "elm.text";
rel2.offset: 1 1;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "list_item_selected";
text { font: FN; size: 10;
text_source: "elm.text";
diff --git a/data/themes/edc/elm/map.edc b/data/themes/edc/elm/map.edc
index 90b3fe415..fe3170f71 100644
--- a/data/themes/edc/elm/map.edc
+++ b/data/themes/edc/elm/map.edc
@@ -38,8 +38,7 @@ group { name: "elm/map/marker/radio/default";
rel1.to: "elm.icon";
rel2.to: "elm.icon";
color_class: "map_radio";
- color: 21 21 21 255;
- color3: 255 255 255 192;
+ color: FN_COL_DISABLE_SHADOW;
text { font: FNBD; size: 10;
text_class: "map_radio";
min: 1 1;
@@ -73,8 +72,7 @@ group { name: "elm/map/marker/empty/default";
rel1.to: "knob";
rel2.to: "knob";
color_class: "map_empty";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 10;
text_class: "map_empty";
min: 1 1;
@@ -114,8 +112,7 @@ group { name: "elm/map/scale/base/default";
rel1.offset: 6 5;
rel2.offset: -7 -5;
color_class: "map_scale";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 10;
text_class: "map_scale";
min: 1 1;
diff --git a/data/themes/edc/elm/menu.edc b/data/themes/edc/elm/menu.edc
index 81757d4eb..9e8e106f8 100644
--- a/data/themes/edc/elm/menu.edc
+++ b/data/themes/edc/elm/menu.edc
@@ -103,8 +103,7 @@ group { name: "elm/menu/item/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "menu_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -130,9 +129,7 @@ group { name: "elm/menu/item/default";
rel1.to: "elm.text";
rel2.offset: 2 1;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "menu_item_active";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -484,8 +481,7 @@ group { name: "elm/menu/main_menu_submenu/default";
description { state: "default" 0.0;
rel1.to: "elm.text";
rel2.to: "elm.text";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "menu_item_disabled";
text { font: FN; size: 10;
text_source: "elm.text";
@@ -511,9 +507,7 @@ group { name: "elm/menu/main_menu_submenu/default";
rel1.to: "elm.text";
rel2.offset: 2 1;
rel2.to: "elm.text";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "menu_item_active";
text { font: FN; size: 10;
text_source: "elm.text";
diff --git a/data/themes/edc/elm/multibuttonentry.edc b/data/themes/edc/elm/multibuttonentry.edc
index bbe03f5cd..6234dd1e0 100644
--- a/data/themes/edc/elm/multibuttonentry.edc
+++ b/data/themes/edc/elm/multibuttonentry.edc
@@ -15,9 +15,7 @@ group { name: "elm/multibuttonentry/label/default";
effect: GLOW;
scale: 1;
description { state: "default" 0.0;
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "multibuttonentry_label";
text { font: FNBD; size: 10;
min: 1 1;
@@ -58,8 +56,7 @@ group { name: "elm/multibuttonentry/guidetext/default";
description { state: "default" 0.0;
rel1.offset: 2 2;
rel2.offset: -3 -3;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
text { font: FNBD; size: 10;
min: 0 1;
align: 0.0 0.5;
diff --git a/data/themes/edc/elm/naviframe.edc b/data/themes/edc/elm/naviframe.edc
index 025d24ab4..6bf6149d3 100644
--- a/data/themes/edc/elm/naviframe.edc
+++ b/data/themes/edc/elm/naviframe.edc
@@ -138,8 +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: 255 255 255 255;
- color3: 0 0 0 18;
+ color: FN_COL_DEFAULT_SOFT_SHADOW;
text { font: FN; size: 8;
text: "X";
text_class: "title_bar_sub";
@@ -161,8 +160,7 @@ group { name: "elm/naviframe/item/basic/default";
rel2.to_y: "title1";
rel2.offset: -1 -1;
align: 0.5 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 18;
+ color: FN_COL_DEFAULT_SOFT_SHADOW;
text { font: FNBD; size: 10;
text: "X";
text_class: "title_bar";
@@ -182,8 +180,7 @@ group { name: "elm/naviframe/item/basic/default";
rel2.to_y: "title2";
rel2.offset: -1 -3;
align: 0.5 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 18;
+ color: FN_COL_DEFAULT_SOFT_SHADOW;
text { font: FN; size: 8;
text: "X";
text_class: "title_bar_sub";
@@ -312,8 +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: 255 255 255 255;
- color3: 0 0 0 18;
+ color: FN_COL_DEFAULT_SOFT_SHADOW;
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.5;
@@ -339,8 +335,7 @@ group { name: "elm/naviframe/item/basic/default";
rel2.to_y: "elm.text.title";
rel2.offset: -1 -3;
align: 0.5 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FN; size: 8;
text_class: "title_bar_sub";
align: 0.5 0.0;
diff --git a/data/themes/edc/elm/progress.edc b/data/themes/edc/elm/progress.edc
index d8be3d312..7d0a8ec89 100644
--- a/data/themes/edc/elm/progress.edc
+++ b/data/themes/edc/elm/progress.edc
@@ -122,8 +122,7 @@ group { name: "elm/progressbar/horizontal/default";
rel2.to_x: "elm.swallow.content";
rel2.relative: 1.0 1.0;
rel2.offset: -1 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "progressbar_text";
text { font: FN; size: 10;
text_class: "progressbar";
@@ -143,8 +142,7 @@ group { name: "elm/progressbar/horizontal/default";
description { state: "disabled_visible" 0.0;
inherit: "visible" 0.0;
color_class: "progressbar_text_disabled";
- color: 21 21 21 255;
- color3: 255 255 255 15;
+ color: FN_COL_DISABLE_LIGHTER_SHADOW;
}
}
part { name: "bg-hi";
@@ -339,9 +337,7 @@ group { name: "elm/progressbar/horizontal/default";
text_class: "progress_status";
align: 1.0 0.5;
}
- color: 255 255 255 255;
- color2: 51 153 255 64;
- color3: 51 153 255 32;
+ color: FN_COL_HIGHLIGHT_CLICKED;
visible: 1;
}
description { state: "hidden" 0.0;
@@ -681,8 +677,7 @@ group { name: "elm/progressbar/vertical/default";
rel2.to_y: "elm.swallow.content";
rel2.relative: 1.0 1.0;
rel2.offset: -3 -1;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "progressbar_text";
text { font: FN; size: 10;
text_class: "progressbar";
@@ -702,8 +697,7 @@ group { name: "elm/progressbar/vertical/default";
description { state: "disabled_visible" 0.0;
inherit: "visible" 0.0;
color_class: "progressbar_text_disabled";
- color: 21 21 21 255;
- color3: 255 255 255 15;
+ color: FN_COL_DISABLE_LIGHTER_SHADOW;
}
}
part { name: "bg-hi";
@@ -907,9 +901,7 @@ group { name: "elm/progressbar/vertical/default";
text_class: "progress_status";
align: 1.0 0.5;
}
- color: 255 255 255 255;
- color2: 51 153 255 64;
- color3: 51 153 255 32;
+ color: FN_COL_HIGHLIGHT_CLICKED;
visible: 1;
map.on: 1;
map.smooth: 0;
diff --git a/data/themes/edc/elm/radio.edc b/data/themes/edc/elm/radio.edc
index 2dacbe9e8..e391d90db 100644
--- a/data/themes/edc/elm/radio.edc
+++ b/data/themes/edc/elm/radio.edc
@@ -164,8 +164,7 @@ group { name: "elm/radio/base/default";
rel1.to_x: "elm.swallow.content";
rel1.relative: 1.0 0.0;
rel2.offset: -3 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "radio_text";
text { font: FN; size: 10;
min: 0 0;
@@ -175,8 +174,7 @@ group { name: "elm/radio/base/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
diff --git a/data/themes/edc/elm/segment_control.edc b/data/themes/edc/elm/segment_control.edc
index 3ab699c03..365f8282d 100644
--- a/data/themes/edc/elm/segment_control.edc
+++ b/data/themes/edc/elm/segment_control.edc
@@ -192,8 +192,7 @@ group { name: "elm/segment_control/item/default";
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color3: 255 255 255 0;
+ color: FN_COL_DEFAULT_BASIC2;
visible: 1;
}
description { state: "disabled" 0.0;
@@ -221,9 +220,7 @@ group { name: "elm/segment_control/item/default";
text_source: "elm.text";
text_class: "button";
}
- color: 255 255 255 255;
- color2: 255 255 255 24;
- color3: 255 255 255 18;
+ color: FN_COL_WHITE_GLOW;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
diff --git a/data/themes/edc/elm/slider.edc b/data/themes/edc/elm/slider.edc
index 578b25f56..4aefb02f7 100644
--- a/data/themes/edc/elm/slider.edc
+++ b/data/themes/edc/elm/slider.edc
@@ -262,8 +262,7 @@ group { name: "elm/slider/horizontal/default";
rel2.to_x: "elm.swallow.icon";
rel2.relative: 1.0 1.0;
rel2.offset: -1 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "slider_text";
text { font: FN; size: 10;
text_class: "slider";
@@ -283,8 +282,7 @@ group { name: "elm/slider/horizontal/default";
description { state: "disabled_visible" 0.0;
inherit: "visible" 0.0;
color_class: "slider_text_disabled";
- color: 21 21 21 255;
- color3: 255 255 255 15;
+ color: FN_COL_DISABLE;
}
}
part { name: "elm.swallow.end"; type: SWALLOW;
@@ -356,8 +354,7 @@ group { name: "elm/slider/horizontal/default";
fixed: 1 1;
rel1.to_x: "limits";
rel2.to_x: "limits";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "slider_text";
text { font: FN; size: 10;
text_class: "slider";
@@ -371,8 +368,7 @@ group { name: "elm/slider/horizontal/default";
}
description { state: "disabled_visible" 0.0;
inherit: "visible" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 15;
+ color: FN_COL_DISABLE_LIGHTER_SHADOW;
color_class: "slider_text_disabled";
}
}
@@ -672,8 +668,7 @@ group { name: "elm/slider/horizontal/indicator/default";
rel2.relative: 1.0 -0.1;
rel2.offset: -1 -12;
color_class: "slider_indicator";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 10;
min: 1 1;
align: 0.5 1.0;
@@ -974,8 +969,7 @@ group { name: "elm/slider/vertical/default";
rel2.to_y: "elm.swallow.icon";
rel2.relative: 1.0 1.0;
rel2.offset: -3 -1;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "slider_text";
text { font: FN; size: 10;
text_class: "slider";
@@ -994,8 +988,7 @@ group { name: "elm/slider/vertical/default";
description { state: "disabled_visible" 0.0;
inherit: "visible" 0.0;
color_class: "slider_text_disabled";
- color: 21 21 21 255;
- color3: 255 255 255 15;
+ color: FN_COL_DISABLE_LIGHTER_SHADOW;
}
}
part { name: "elm.swallow.end"; type: SWALLOW;
@@ -1067,8 +1060,7 @@ group { name: "elm/slider/vertical/default";
fixed: 1 1;
rel1.to_y: "limits";
rel2.to_y: "limits";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "slider_text";
text { font: FN; size: 10;
text_class: "slider";
@@ -1083,8 +1075,7 @@ group { name: "elm/slider/vertical/default";
}
description { state: "disabled_visible" 0.0;
inherit: "visible" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 15;
+ color: FN_COL_DISABLE_LIGHTER_SHADOW;
color_class: "slider_text_disabled";
}
}
@@ -1384,8 +1375,7 @@ group { name: "elm/slider/vertical/indicator/default";
rel2.relative: 1.1 1.0;
rel2.offset: 11 -1;
color_class: "slider_indicator";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 10;
min: 1 1;
align: 0.0 0.5;
diff --git a/data/themes/edc/elm/toolbar.edc b/data/themes/edc/elm/toolbar.edc
index 979370945..e3c4d9be6 100644
--- a/data/themes/edc/elm/toolbar.edc
+++ b/data/themes/edc/elm/toolbar.edc
@@ -608,8 +608,7 @@ group { name: "elm/toolbar/item/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "toolbar_item_disabled";
}
description { state: "noicon" 0.0;
@@ -620,8 +619,7 @@ group { name: "elm/toolbar/item/default";
}
description { state: "noicon_disabled" 0.0;
inherit: "noicon" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "toolbar_item_disabled";
}
description { state: "icononly" 0.0;
@@ -702,8 +700,7 @@ group { name: "elm/toolbar/item/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "toolbar_item_disabled";
}
description { state: "noicon" 0.0;
@@ -714,8 +711,7 @@ group { name: "elm/toolbar/item/default";
}
description { state: "noicon_disabled" 0.0;
inherit: "noicon" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "toolbar_item_disabled";
}
description { state: "icononly" 0.0;
@@ -1043,8 +1039,7 @@ group { name: "elm/toolbar/item/item_horizontal";
rel1.to_x: "elm.swallow.icon";
rel2.offset: -5 -3;
align: 0.0 0.5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "toolbar_item";
text { font: FN; size: 10;
min: 1 1;
@@ -1059,8 +1054,7 @@ group { name: "elm/toolbar/item/item_horizontal";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "toolbar_item_disabled";
}
description { state: "noicon" 0.0;
@@ -1072,8 +1066,7 @@ group { name: "elm/toolbar/item/item_horizontal";
}
description { state: "noicon_disabled" 0.0;
inherit: "noicon" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "toolbar_item_disabled";
}
description { state: "icononly" 0.0;
@@ -1107,8 +1100,7 @@ group { name: "elm/toolbar/item/item_horizontal";
rel1.to_x: "elm.swallow.icon";
rel2.offset: -5 -3;
align: 0.0 0.5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "toolbar_item";
text { font: FN; size: 10;
min: 1 1;
@@ -1123,8 +1115,7 @@ group { name: "elm/toolbar/item/item_horizontal";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "toolbar_item_disabled";
}
description { state: "noicon" 0.0;
@@ -1136,8 +1127,7 @@ group { name: "elm/toolbar/item/item_horizontal";
}
description { state: "noicon_disabled" 0.0;
inherit: "noicon" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "toolbar_item_disabled";
}
description { state: "icononly" 0.0;
diff --git a/data/themes/edc/evrything.edc b/data/themes/edc/evrything.edc
index ec9de7b1d..0fd3536d4 100644
--- a/data/themes/edc/evrything.edc
+++ b/data/themes/edc/evrything.edc
@@ -205,8 +205,7 @@ group { name: "e/modules/everything/selector_item";
rel2.to: "clip";
rel1.offset: 2 3;
rel2.offset: -6 -7;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "menu_item";
text { font: FNBD; size: 10;
min: 0 1;
@@ -228,9 +227,7 @@ group { name: "e/modules/everything/selector_item";
rel1.to: "e.text.label";
rel2.offset: 2 0;
rel2.to: "e.text.label";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "menu_item_active";
text { font: FNBD; size: 10;
text_source: "e.text.label";
@@ -253,8 +250,7 @@ group { name: "e/modules/everything/selector_item";
align: 1.0 0.0;
rel1.offset: 6 6;
rel2.offset: -7 -1;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "menu_item";
text { font: FN; size: 10;
min: 0 1;
@@ -276,9 +272,7 @@ group { name: "e/modules/everything/selector_item";
rel1.to: "e.text.plugin";
rel2.offset: 1 1;
rel2.to: "e.text.plugin";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "menu_item_active";
text { font: FN; size: 10;
text_source: "e.text.plugin";
@@ -454,8 +448,7 @@ group { name: "e/modules/everything/list";
rel1.offset: 4 4;
rel2.relative: 0.0 0.0;
rel2.offset: 4 4;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FN; size: 10;
align: 0.0 0.5;
min: 1 1;
@@ -759,8 +752,7 @@ group { name: "e/modules/everything/tab_item";
rel2.offset: -5 -3;
rel2.relative: 0.5 1.0;
align: 0.5 0.5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "menu_item";
text { font: FN; size: 10;
min: 1 1;
@@ -782,9 +774,7 @@ group { name: "e/modules/everything/tab_item";
rel1.to: "e.text.label";
rel2.offset: 2 1;
rel2.to: "e.text.label";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "menu_item_active";
text { font: FN; size: 10;
text_source: "e.text.label";
@@ -1385,9 +1375,7 @@ group { name: "e/modules/everything/thumbview/item/thumb";
rel1.to: "e.text.label";
rel2.offset: 2 2;
rel2.to: "e.text.label";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "menu_item_active";
text { font: FN; size: 10;
text_source: "e.text.label";
@@ -1613,8 +1601,7 @@ group { name: "e/modules/everything/thumbview/item/list";
rel2.offset: -3 -3;
rel2.relative: 0.0 1.0;
rel2.to_x: "arrow";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "ilist_item";
align: 1.0 0.5;
max: 160 99999;
@@ -1638,9 +1625,7 @@ group { name: "e/modules/everything/thumbview/item/list";
rel1.to: "e.text.detail";
rel2.offset: 1 1;
rel2.to: "e.text.detail";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "ilist_item_selected";
align: 1.0 0.5;
max: 160 99999;
@@ -1667,8 +1652,7 @@ group { name: "e/modules/everything/thumbview/item/list";
rel2.offset: -3 -3;
rel2.relative: 0.0 1.0;
rel2.to_x: "e.text.detail";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "ilist_item";
text { font: FN; size: 10;
min: 0 1;
@@ -1689,9 +1673,7 @@ group { name: "e/modules/everything/thumbview/item/list";
rel1.to: "e.text.label";
rel2.offset: 2 1;
rel2.to: "e.text.label";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "ilist_item_selected";
text { font: FN; size: 10;
min: 0 1;
diff --git a/data/themes/edc/fileman.edc b/data/themes/edc/fileman.edc
index cea767ab6..26b1bba3b 100644
--- a/data/themes/edc/fileman.edc
+++ b/data/themes/edc/fileman.edc
@@ -80,8 +80,7 @@ group { name: "e/fileman/default/list/variable";
rel1.to_x: "icon0";
rel2.offset: -3 -3;
rel2.relative: 1.0 1.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "ilist_item";
text { font: FN; size: 10;
min: 1 1;
@@ -104,8 +103,7 @@ group { name: "e/fileman/default/list/variable";
description { state: "default" 0.0;
rel1.to: "e.text.label";
rel2.to: "e.text.label";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "ilist_item_disabled";
text { font: FN; size: 10;
text_source: "e.text.label";
@@ -131,9 +129,7 @@ group { name: "e/fileman/default/list/variable";
rel1.to: "e.text.label";
rel2.offset: 2 1;
rel2.to: "e.text.label";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "ilist_item_selected";
text { font: FN; size: 10;
text_source: "e.text.label";
@@ -1219,8 +1215,7 @@ group { name: "e/fileman/popup/default";
rel2.relative: 1.0 0.0;
rel2.offset: -2 3;
align: 0.5 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 10;
text_class: "fileman_popup_title";
align: 0.5 0.0;
@@ -1319,8 +1314,7 @@ group { name: "e/fileman/default/overlay";
rel2.offset: 12 -1;
rel2.to: "knob";
align: 0.0 0.5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "fileman_busy";
text { font: FNBD; size: 10;
min: 1 1;
@@ -1381,8 +1375,7 @@ group { name: "e/fileman/default/overlay";
rel1.offset: -8 -8;
rel2.relative: 0.5 0.5;
rel2.offset: 7 7;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "fileman_typebuf";
text { font: FNBD; size: 10;
min: 1 1;
@@ -2218,8 +2211,7 @@ group { name: "modules/efm_navigation/pathbar_button";
description { state: "default" 0.0;
rel1.offset: 6 6;
rel2.offset: -7 -6;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "button_text";
text { font: FN; size: 10;
min: 1 1;
@@ -2240,9 +2232,7 @@ group { name: "modules/efm_navigation/pathbar_button";
rel1.to: "e.text.label";
rel2.offset: 3 1;
rel2.to: "e.text.label";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "button_selected";
text { font: FN; size: 10;
text_source: "e.text.label";
diff --git a/data/themes/edc/fontpreview.edc b/data/themes/edc/fontpreview.edc
index 58ac322ae..2bffb9039 100644
--- a/data/themes/edc/fontpreview.edc
+++ b/data/themes/edc/fontpreview.edc
@@ -7,8 +7,7 @@ group { name: "e/widgets/fontpreview";
color_class: "entry_text";
rel1.offset: 3 3;
rel2.offset: -4 -4;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FN; size: 10;
min: 1 1;
align: 0.5 0.5;
diff --git a/data/themes/edc/frame.edc b/data/themes/edc/frame.edc
index c3833617c..8ac02bbc4 100644
--- a/data/themes/edc/frame.edc
+++ b/data/themes/edc/frame.edc
@@ -69,8 +69,7 @@ group { name: "e/widgets/frame";
rel2.offset: -2 2;
rel2.to_x: "edge2";
align: 0.0 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
text { font: FNBD; size: 10;
text_class: "frame";
align: 0.0 0.0;
diff --git a/data/themes/edc/ibar-ibox.edc b/data/themes/edc/ibar-ibox.edc
index 322d96637..91bf06339 100644
--- a/data/themes/edc/ibar-ibox.edc
+++ b/data/themes/edc/ibar-ibox.edc
@@ -304,8 +304,7 @@ group { name: "e/modules/ibar/menu/item";
rel1.relative: 1.0 0.0;
rel1.offset: 3 0;
rel2.offset: -3 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
align: 0.0 0.0;
color_class: "menu_item";
min: 128 0;
@@ -329,9 +328,7 @@ group { name: "e/modules/ibar/menu/item";
rel1.to: "e.text.title";
rel2.offset: 2 1;
rel2.to: "e.text.title";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "menu_item_active";
min: 128 0;
text { font: FNBD; size: 10;
@@ -482,8 +479,7 @@ group { name: "e/modules/ibox/icon_overlay";
description { state: "default" 0.0;
rel1.relative: 0.0 1.0;
rel2.relative: 1.0 1.0;
- color: 255 255 255 0;
- color3: 0 0 0 0;
+ color: FN_COL_TRANSPARENT;
color_class: "module_label";
text { font: FN; size: 10;
min: 1 1;
@@ -495,8 +491,7 @@ group { name: "e/modules/ibox/icon_overlay";
inherit: "default" 0.0;
rel1.relative: 0.0 0.5;
rel2.relative: 1.0 0.5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
}
}
}
diff --git a/data/themes/edc/ilist.edc b/data/themes/edc/ilist.edc
index 90206a00a..078a4eb99 100644
--- a/data/themes/edc/ilist.edc
+++ b/data/themes/edc/ilist.edc
@@ -32,8 +32,7 @@ group { name: "e/ilist";
rel1.offset: -8 -8;
rel2.relative: 0.5 0.5;
rel2.offset: 7 7;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "ilist_typebuf";
text { font: FNBD; size: 10;
min: 1 1;
@@ -141,8 +140,7 @@ group { name: "e/widgets/ilist";
rel2.offset: -3 -3;
rel2.relative: 0.0 1.0;
rel2.to_x: "e.swallow.end";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "ilist_item";
text { font: FN; size: 10;
min: 1 1;
@@ -165,8 +163,7 @@ group { name: "e/widgets/ilist";
description { state: "default" 0.0;
rel1.to: "e.text.label";
rel2.to: "e.text.label";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "ilist_item_disabled";
text { font: FN; size: 10;
text_source: "e.text.label";
@@ -192,9 +189,7 @@ group { name: "e/widgets/ilist";
rel1.to: "e.text.label";
rel2.offset: 2 1;
rel2.to: "e.text.label";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "ilist_item_selected";
text { font: FN; size: 10;
text_source: "e.text.label";
@@ -344,8 +339,7 @@ group { name: "e/widgets/ilist_header";
rel2.offset: -3 -7;
rel2.relative: 0.0 1.0;
rel2.to_x: "e.swallow.end";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "ilist_item_header";
text { font: FNBD; size: 10;
min: 0 1;
diff --git a/data/themes/edc/init.edc b/data/themes/edc/init.edc
index 254701e0b..10faaab2f 100644
--- a/data/themes/edc/init.edc
+++ b/data/themes/edc/init.edc
@@ -63,8 +63,7 @@ group { name: "e/init/splash";
rel2.relative: 0.95 0.0;
rel2.offset: -5 -1;
rel2.to_y: "e.text.status";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 20;
min: 0 1;
text_class: "init_title";
@@ -83,9 +82,7 @@ group { name: "e/init/splash";
rel2.relative: 0.95 0.0;
rel2.offset: -5 -1;
rel2.to_y: "logo";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
text { font: FN; size: 10;
min: 0 1;
text_class: "init_status";
@@ -101,9 +98,7 @@ group { name: "e/init/splash";
rel1.offset: -4 -4;
rel2.relative: 1.0 1.0;
rel2.offset: -4 -4;
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
text { font: FN; size: 8;
text: "0.19";
min: 1 1;
diff --git a/data/themes/edc/label.edc b/data/themes/edc/label.edc
index e5a40808b..d1d59bfe2 100644
--- a/data/themes/edc/label.edc
+++ b/data/themes/edc/label.edc
@@ -6,8 +6,7 @@ group { name: "e/widgets/label";
description { state: "default" 0.0;
rel1.offset: 2 2;
rel2.offset: -3 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "label_text";
text { font: FN; size: 10;
min: 1 1;
@@ -17,8 +16,7 @@ group { name: "e/widgets/label";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
}
}
}
diff --git a/data/themes/edc/menu.edc b/data/themes/edc/menu.edc
index b03d8f446..cf375ff03 100644
--- a/data/themes/edc/menu.edc
+++ b/data/themes/edc/menu.edc
@@ -37,8 +37,7 @@ group { name: "e/widgets/menu/default/background";
rel2.relative: 1.0 0.0;
rel2.offset: -2 -1;
align: 0.5 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
max: 0 0;
text { font: FNBD; size: 10;
text_class: "menu_title";
@@ -266,8 +265,7 @@ group { name: "e/widgets/menu/default/label";
description { state: "default" 0.0;
rel1.offset: 5 -1;
rel2.offset: -4 -1;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "menu_item";
text { font: FN; size: 10;
min: 1 1;
@@ -290,8 +288,7 @@ group { name: "e/widgets/menu/default/label";
description { state: "default" 0.0;
rel1.to: "e.text.label";
rel2.to: "e.text.label";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "menu_item_disabled";
text { font: FN; size: 10;
text_source: "e.text.label";
@@ -317,9 +314,7 @@ group { name: "e/widgets/menu/default/label";
rel1.to: "e.text.label";
rel2.offset: 2 1;
rel2.to: "e.text.label";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "menu_item_active";
text { font: FN; size: 10;
text_source: "e.text.label";
diff --git a/data/themes/edc/notification.edc b/data/themes/edc/notification.edc
index 878e912a2..40314b716 100644
--- a/data/themes/edc/notification.edc
+++ b/data/themes/edc/notification.edc
@@ -116,8 +116,7 @@ group { name: "e/modules/notification/main";
rel2.relative: 0.0 0.0;
rel2.to_x: "e.event.close";
rel2.offset: -5 12;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
align: 0.0 0.0;
color_class: "notification_title";
text { font: FNBD; size: 10;
diff --git a/data/themes/edc/packagekit.edc b/data/themes/edc/packagekit.edc
index 1e2d2fd7b..e37d35176 100644
--- a/data/themes/edc/packagekit.edc
+++ b/data/themes/edc/packagekit.edc
@@ -110,8 +110,7 @@ group { name: "e/modules/packagekit/main";
description { state: "default" 0.0;
rel1.relative: (36/160) (60/160);
rel2.relative: ((36+88)/160) ((60+88)/160);
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
text { font: FN; size: 10;
}
}
diff --git a/data/themes/edc/pager.edc b/data/themes/edc/pager.edc
index 885881729..9e764558d 100644
--- a/data/themes/edc/pager.edc
+++ b/data/themes/edc/pager.edc
@@ -38,8 +38,7 @@ group { name: "e/modules/pager/popup";
rel2.relative: 1.0 0.0;
rel2.offset: -1 1;
align: 0.5 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.0;
@@ -154,8 +153,7 @@ group { name: "e/modules/pager/desk";
color_class: "module_label";
rel1.to: "base";
rel2.to: "base";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FN; size: 10;
text_class: "module_small";
align: 0.5 0.5;
diff --git a/data/themes/edc/pager16.edc b/data/themes/edc/pager16.edc
index 109e015ea..55995b5f6 100644
--- a/data/themes/edc/pager16.edc
+++ b/data/themes/edc/pager16.edc
@@ -38,8 +38,7 @@ group { name: "e/modules/pager2/popup";
rel2.relative: 1.0 0.0;
rel2.offset: -1 1;
align: 0.5 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.0;
@@ -133,8 +132,7 @@ group { name: "e/modules/pager2/desk";
color_class: "module_label";
rel1.to: "base";
rel2.to: "base";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: "Sans"; size: 10;
text_class: "module_small";
align: 0.5 0.5;
diff --git a/data/themes/edc/radio.edc b/data/themes/edc/radio.edc
index be25e71df..bdb00740f 100644
--- a/data/themes/edc/radio.edc
+++ b/data/themes/edc/radio.edc
@@ -50,8 +50,7 @@ group { name: "e/widgets/radio";
rel1.to_x: "inset";
rel1.relative: 1.0 0.0;
rel2.offset: -3 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "radio_text";
text { font: FN; size: 10;
min: 1 1;
@@ -61,8 +60,7 @@ group { name: "e/widgets/radio";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
}
}
part { name: "event"; type: RECT;
@@ -133,8 +131,7 @@ group { name: "e/widgets/radio_icon";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
}
}
}
diff --git a/data/themes/edc/slider.edc b/data/themes/edc/slider.edc
index a532516d9..5fcf908cb 100644
--- a/data/themes/edc/slider.edc
+++ b/data/themes/edc/slider.edc
@@ -77,8 +77,7 @@ group { name: "e/widgets/slider_horizontal";
rel1.relative: 1.0 0.0;
rel2.offset: -1 -1;
align: 1.0 0.5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "slider_text";
text { font: FN; size: 10;
min: 0 1;
@@ -112,8 +111,7 @@ group { name: "e/widgets/slider_horizontal";
description { state: "default" 0.0;
rel1.to: "e.text.label";
rel2.to: "e.text.label";
- color: 21 21 21 255;
- color3: 255 255 255 15;
+ color: FN_COL_DISABLE;
color_class: "slider_text";
text { font: FN; size: 10;
text_source: "e.text.label";
@@ -303,8 +301,7 @@ group { name: "e/widgets/slider_vertical";
rel1.relative: 0.0 1.0;
rel2.offset: -1 -1;
align: 0.5 1.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "slider_text";
text { font: FN; size: 10;
min: 0 0;
@@ -338,8 +335,7 @@ group { name: "e/widgets/slider_vertical";
description { state: "default" 0.0;
rel1.to: "e.text.label";
rel2.to: "e.text.label";
- color: 21 21 21 255;
- color3: 255 255 255 15;
+ color: FN_COL_DISABLE;
color_class: "slider_text";
text { font: FN; size: 10;
text_source: "e.text.label";
diff --git a/data/themes/edc/syscon.edc b/data/themes/edc/syscon.edc
index 618a1265c..eeb60d886 100644
--- a/data/themes/edc/syscon.edc
+++ b/data/themes/edc/syscon.edc
@@ -73,8 +73,7 @@ group { name: "e/widgets/syscon/main";
rel1.to_y: "e.swallow.extra";
rel2.offset: -1 -14;
rel2.relative: 0.5 1.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "button_text";
align: 0.5 1.0;
text { font: FN; size: 10;
@@ -174,8 +173,7 @@ group { name: "e/widgets/syscon/item/button";
rel2.offset: -7 -7;
rel2.to: "base";
align: 0.5 1.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "button_text";
text { font: FN; size: 10;
min: 1 1;
@@ -196,8 +194,7 @@ group { name: "e/widgets/syscon/item/button";
description { state: "default" 0.0;
rel1.to: "e.text.label";
rel2.to: "e.text.label";
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
color_class: "button_text_disabled";
text { font: FN; size: 10;
text_source: "e.text.label";
diff --git a/data/themes/edc/tasks.edc b/data/themes/edc/tasks.edc
index 8468496b2..0d980c4b7 100644
--- a/data/themes/edc/tasks.edc
+++ b/data/themes/edc/tasks.edc
@@ -73,9 +73,7 @@ group { name:"e/modules/tasks/item";
rel1.to: "e.text.label";
rel2.offset: 3 1;
rel2.to: "e.text.label";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "ilist_item_selected";
text { font: FN; size: 10;
text_source: "e.text.label";
@@ -85,9 +83,7 @@ group { name:"e/modules/tasks/item";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color2: 51 153 255 64;
- color3: 51 153 255 32;
+ color: FN_COL_HIGHLIGHT_CLICKED;
}
}
part { name: "base";
@@ -119,8 +115,7 @@ group { name:"e/modules/tasks/item";
rel1.to_y: "sel_base";
rel2.offset: -5 -5;
rel2.to: "sel_base";
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "tasks_text";
text { font: FN; size: 10;
min: 0 1;
@@ -130,8 +125,7 @@ group { name:"e/modules/tasks/item";
}
description { state: "iconic" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
}
}
part { name: "icon"; type: SPACER;
diff --git a/data/themes/edc/temperature.edc b/data/themes/edc/temperature.edc
index 695b8d9b1..b7638cfa5 100644
--- a/data/themes/edc/temperature.edc
+++ b/data/themes/edc/temperature.edc
@@ -42,9 +42,7 @@ group { name: "e/modules/temperature/main";
effect: SHADOW BOTTOM;
clip_to: "fade_clip";
description { state: "default" 0.0;
- color: 255 255 255 0;
- color2: 0 0 0 255;
- color3: 0 0 0 0;
+ color: FN_COL_SHADOW_BOTTOM;
color_class: "module_label";
text { font: FN; size: 10;
min: 1 1;
@@ -53,8 +51,7 @@ group { name: "e/modules/temperature/main";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
}
}
part { name: "fade_clip"; type: RECT;
diff --git a/data/themes/edc/toolbar.edc b/data/themes/edc/toolbar.edc
index 98364fa95..4a4ecffac 100644
--- a/data/themes/edc/toolbar.edc
+++ b/data/themes/edc/toolbar.edc
@@ -256,8 +256,7 @@ group { name: "e/widgets/toolbar/item";
rel1.relative: 0.0 1.0;
rel2.offset: -5 -3;
align: 0.5 1.0;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "menu_item";
text { font: FN; size: 10;
min: 1 1;
@@ -279,9 +278,7 @@ group { name: "e/widgets/toolbar/item";
rel1.to: "e.text.label";
rel2.offset: 2 1;
rel2.to: "e.text.label";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "menu_item_active";
text { font: FN; size: 10;
text_source: "e.text.label";
diff --git a/data/themes/edc/winlist.edc b/data/themes/edc/winlist.edc
index 101dd269a..d2df85acc 100644
--- a/data/themes/edc/winlist.edc
+++ b/data/themes/edc/winlist.edc
@@ -32,8 +32,7 @@ group { name: "e/widgets/winlist/main";
rel2.relative: 1.0 0.0;
rel2.offset: -2 3;
align: 0.5 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
text { font: FNBD; size: 10;
text_class: "menu_title";
align: 0.5 0.0;
@@ -66,8 +65,7 @@ group { name: "e/widgets/winlist/main";
rel2.offset: -7 -1;
rel2.to_y: "e.swallow.icon";
align: 0.0 0.5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 10;
text_class: "winlist_label";
align: 0.0 0.5;
@@ -140,8 +138,7 @@ group { name: "e/widgets/winlist/item";
rel1.relative: 1.0 0.0;
rel1.to_x: "icon";
rel2.offset: -3 -3;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
color_class: "ilist_item";
text { font: FN; size: 10;
min: 0 1;
@@ -151,8 +148,7 @@ group { name: "e/widgets/winlist/item";
}
description { state: "iconified" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
}
}
part { name: "sel_shadow"; mouse_events: 0;
@@ -223,9 +219,7 @@ group { name: "e/widgets/winlist/item";
rel1.to: "e.text.label";
rel2.offset: 2 1;
rel2.to: "e.text.label";
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
color_class: "ilist_item_selected";
text { font: FN; size: 10;
text_source: "e.text.label";
diff --git a/data/themes/edc/wizard.edc b/data/themes/edc/wizard.edc
index dc3df57bb..a24742f41 100644
--- a/data/themes/edc/wizard.edc
+++ b/data/themes/edc/wizard.edc
@@ -99,8 +99,7 @@ group { name: "e/wizard/main";
rel1.offset: 4 -5;
rel2.relative: 0.5 0.99;
rel2.offset: -5 -5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FN; size: 10;
text: "Next";
min: 1 1;
@@ -108,8 +107,7 @@ group { name: "e/wizard/main";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 21 21 21 255;
- color3: 255 255 255 25;
+ color: FN_COL_DISABLE;
}
}
part { name: "shadow"; mouse_events: 0;
@@ -137,9 +135,7 @@ group { name: "e/wizard/main";
rel2.relative: 0.95 0.01;
rel2.offset: -5 4;
align: 0.5 0.0;
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
+ color: FN_COL_HIGHLIGHT;
text { font: FNBD; size: 10;
min: 0 1;
text_class: "init_title";
diff --git a/data/themes/edc/xkbswitch.edc b/data/themes/edc/xkbswitch.edc
index 85873dcc0..bd61ffccc 100644
--- a/data/themes/edc/xkbswitch.edc
+++ b/data/themes/edc/xkbswitch.edc
@@ -28,9 +28,7 @@ group { name: "e/modules/xkbswitch/main";
rel1.relative: 0.0 0.5;
rel2.to: "e.swallow.flag";
rel2.relative: 1.0 0.5;
- color: 255 255 255 0;
- color2: 0 0 0 0;
- color3: 0 0 0 0;
+ color: FN_COL_OUTLINE_TRANSPARENT;
text { font: FN; size: 9;
min: 0 1;
text_class: "module_small";
@@ -39,9 +37,7 @@ group { name: "e/modules/xkbswitch/main";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color2: 0 0 0 128;
- color3: 0 0 0 24;
+ color: FN_COL_OUTLINE_DEFAULT;
}
}
part { name: "bevel"; mouse_events: 0;
@@ -126,8 +122,7 @@ group { name: "e/modules/xkbswitch/noflag";
rel1.relative: 0.0 0.5;
rel2.to: "base";
rel2.relative: 1.0 0.5;
- color: 255 255 255 255;
- color3: 0 0 0 128;
+ color: FN_COL_DEFAULT;
text { font: FNBD; size: 9;
min: 0 1;
text_class: "module_small";
diff --git a/data/themes/fonts.edc b/data/themes/fonts.edc
index 8a31bd490..a196ee4d8 100644
--- a/data/themes/fonts.edc
+++ b/data/themes/fonts.edc
@@ -15,10 +15,43 @@
#define FNIT "Sans:style=Oblique"
#define FNBDIT "Sans:style=Bold Italic"
+#define FN_COL_DEFAULT_BASIC 255 255 255 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_DEFAULT_SOFT_SHADOW 255 255 255 255; color3: 0 0 0 18
#define FN_COL_HIGHLIGHT 51 153 255 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
+
+/* 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
#define ENABLED_TEXTBLOCK_TAGS \
tag: "em" "+ font_style=Oblique"; \