aboutsummaryrefslogtreecommitdiffstats
path: root/data/themes/edc
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-05 18:22:17 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-05 18:22:17 +0900
commite6303e958dc8f0102ec0a5cdc0f56cb8ff174c6a (patch)
tree1dbb7ab9a52dc597ed49f06830766500deb2b190 /data/themes/edc
parentput in missing macros - they didnt get picked up during cnflict merge fix (diff)
downloadelementary-e6303e958dc8f0102ec0a5cdc0f56cb8ff174c6a.tar.gz
theme - colorclass work.
Diffstat (limited to 'data/themes/edc')
-rw-r--r--data/themes/edc/border.edc22
-rw-r--r--data/themes/edc/comp.edc3
-rw-r--r--data/themes/edc/elm/segment_control.edc1
3 files changed, 14 insertions, 12 deletions
diff --git a/data/themes/edc/border.edc b/data/themes/edc/border.edc
index f4156863f..4e6acc537 100644
--- a/data/themes/edc/border.edc
+++ b/data/themes/edc/border.edc
@@ -79,16 +79,17 @@ group { name: "e/widgets/border/default/border";
}
part { name: "top"; mouse_events: 0;
description { state: "default" 0.0;
- color_class: "border_top";
image.normal: "vgrad_med_lighter.png";
rel2.to_y: "title2";
rel2.offset: -1 -4;
fill.smooth: 0;
TILED_HORIZ(120)
+ color_class: "border_frame";
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
image.normal: "vgrad_med_dark.png";
+ color_class: "border_frame_active";
}
}
part { name: "bevel"; mouse_events: 0;
@@ -105,7 +106,6 @@ group { name: "e/widgets/border/default/border";
scale: 1;
effect: SHADOW BOTTOM;
description { state: "default" 0.0;
- color_class: "border_title";
rel1.relative: 1.0 0.0;
rel1.offset: 1 3;
rel1.to_x: "e.event.icon";
@@ -113,7 +113,8 @@ group { name: "e/widgets/border/default/border";
rel2.offset: -2 3;
rel2.to_x: "e.event.minimize";
align: 0.5 0.0;
- color: FN_COL_DISABLE;
+ color_class: "border_title";
+ color3: 255 255 255 255;
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.0;
@@ -130,7 +131,6 @@ group { name: "e/widgets/border/default/border";
scale: 1;
effect: SOFT_SHADOW BOTTOM;
description { state: "default" 0.0;
- color_class: "border_title_active";
rel1.relative: 1.0 0.0;
rel1.offset: 1 2;
rel1.to_x: "e.event.icon";
@@ -138,7 +138,8 @@ group { name: "e/widgets/border/default/border";
rel2.offset: -1 2;
rel2.to_x: "e.event.minimize";
align: 0.5 0.0;
- color: FN_COL_DEFAULT_SOFT_SHADOW;
+ color_class: "border_title_active";
+ color3: 255 255 255 255;
text { font: FNBD; size: 10;
text_source: "e.text.title";
text_class: "title_bar";
@@ -422,7 +423,6 @@ group { name: "e/widgets/border/default/border";
rel1.offset: 0 -5;
rel2.relative: 1.0 1.0;
min: 0 5;
- color: 64 64 64 255;
fixed: 0 1;
}
description { state: "shaded" 0.0;
@@ -979,7 +979,6 @@ group { name: "e/widgets/border/noresize/border";
}
part { name: "bottom"; type: RECT;
description { state: "default" 0.0;
- color_class: "border_bottom";
rel1.relative: 0.0 1.0;
rel1.offset: 0 -1;
rel2.relative: 1.0 1.0;
@@ -1024,7 +1023,6 @@ group { name: "e/widgets/border/noresize_dialog/border";
}
part { name: "bottom"; type: RECT;
description { state: "default" 0.0;
- color_class: "border_bottom";
rel1.relative: 0.0 1.0;
rel1.offset: 0 -1;
rel2.relative: 1.0 1.0;
@@ -1238,8 +1236,8 @@ group { name: "e/widgets/border/default/move";
rel1.offset: 4 4;
rel1.relative: 1.0 0.0;
rel2.offset: -5 -5;
- color: FN_COL_DEFAULT;
color_class: "move_text";
+ color3: 255 255 255 255;
text { font: FN; size: 10;
min: 1 1;
text_class: "move_text";
@@ -1267,5 +1265,11 @@ group { name: "e/widgets/border/default/resize";
image.normal: "ic_win_resize.png";
}
}
+ part { name: "e.text.label"; type: TEXT;
+ description { state: "default" 0.0;
+ color_class: "resize_text";
+ color3: 255 255 255 255;
+ }
+ }
}
}
diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc
index 796f0be06..0aa558551 100644
--- a/data/themes/edc/comp.edc
+++ b/data/themes/edc/comp.edc
@@ -322,8 +322,7 @@ group { name: "e/comp/frame/default";
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color_class: "";
- color: 255 255 255 255;
+ color_class: "comp_focus_color";
}
}
part { name: "e.swallow.content"; type: SWALLOW;
diff --git a/data/themes/edc/elm/segment_control.edc b/data/themes/edc/elm/segment_control.edc
index 365f8282d..82139657f 100644
--- a/data/themes/edc/elm/segment_control.edc
+++ b/data/themes/edc/elm/segment_control.edc
@@ -192,7 +192,6 @@ group { name: "elm/segment_control/item/default";
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
- color: FN_COL_DEFAULT_BASIC2;
visible: 1;
}
description { state: "disabled" 0.0;