summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaehyub <taehyub.kim@samsung.com>2016-01-04 14:49:11 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-01-04 14:49:12 -0800
commit627ae1ef46668b41bc495cf65ba381dc4c65f88f (patch)
tree36dcb740033454a1d6463b1256af6b8301fbad68
parent918aaaf6ae2f0e0db9af84c453774ae9dac25f95 (diff)
popup: apply popup color class
Summary: Apply popup color class - popup bg - popup title bg - popup title text - popup text Test Plan: 1. change popup color class in colorclass.edc 2. run elementary test 3. check the color of popup Reviewers: Hermet, kimcinoo, woohyun, raster Differential Revision: https://phab.enlightenment.org/D3489 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--data/themes/colorclasses.edc16
-rw-r--r--data/themes/edc/elm/popup.edc9
2 files changed, 21 insertions, 4 deletions
diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index 4fca5367e..98e8c919e 100644
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -300,6 +300,22 @@ color_classes {
300 color: FN_COL_HIGHLIGHT; 300 color: FN_COL_HIGHLIGHT;
301 desc: "Text of an active hoverselector item"; 301 desc: "Text of an active hoverselector item";
302 } 302 }
303 color_class { name: "popup_bg";
304 color: 0 0 0 0;
305 desc: "Color of popup background";
306 }
307 color_class { name: "popup_title_bg";
308 color: 0 0 0 0;
309 desc: "Color of popup title background";
310 }
311 color_class { name: "popup_title_text";
312 color: 255 255 255 255;
313 desc: "Text color of popup title text";
314 }
315 color_class { name: "popup_text";
316 color: 255 255 255 255;
317 desc: "Text color of popup text";
318 }
303 319
304// modules 320// modules
305 color_class { name: "module_label"; 321 color_class { name: "module_label";
diff --git a/data/themes/edc/elm/popup.edc b/data/themes/edc/elm/popup.edc
index e499999cf..5b8cb05ff 100644
--- a/data/themes/edc/elm/popup.edc
+++ b/data/themes/edc/elm/popup.edc
@@ -139,7 +139,7 @@ group { name: "elm/label/base/popup/default";
139 alias: "elm/label/base/popup/transparent"; 139 alias: "elm/label/base/popup/transparent";
140 styles { 140 styles {
141 style { name: "popup_desc_style"; 141 style { name: "popup_desc_style";
142 base: "font="FN" font_size=10 text_class=label align=center color=#fff style=shadow,bottom shadow_color=#00000080 wrap=mixed"; 142 base: "font="FN" font_size=10 text_class=label align=center color=#fff color_class=popup_text style=shadow,bottom shadow_color=#00000080 wrap=mixed";
143 tag: "br" "\n"; 143 tag: "br" "\n";
144 tag: "hilight" "+ font="FNBD" text_class=label_light"; 144 tag: "hilight" "+ font="FNBD" text_class=label_light";
145 tag: "b" "+ font="FNBD" text_class=label_light"; 145 tag: "b" "+ font="FNBD" text_class=label_light";
@@ -175,7 +175,7 @@ group { name: "elm/popup/base/default";
175 alias: "elm/popup/base/transparent"; 175 alias: "elm/popup/base/transparent";
176 styles { 176 styles {
177 style { name: "popup_title_style"; 177 style { name: "popup_title_style";
178 base: "font="FNBD" font_size=10 text_class=label align=center color=#fff style=shadow,bottom shadow_color=#00000080 wrap=mixed"; 178 base: "font="FNBD" font_size=10 text_class=label align=center color=#fff color_class=popup_title_text style=shadow,bottom shadow_color=#00000080 wrap=mixed";
179 tag: "br" "\n"; 179 tag: "br" "\n";
180 tag: "hilight" "+ font="FNBD" text_class=label_light"; 180 tag: "hilight" "+ font="FNBD" text_class=label_light";
181 tag: "b" "+ font="FNBD" text_class=label_light"; 181 tag: "b" "+ font="FNBD" text_class=label_light";
@@ -184,10 +184,11 @@ group { name: "elm/popup/base/default";
184 } 184 }
185 } 185 }
186 parts { 186 parts {
187 part { name: "base"; type: SPACER; 187 part { name: "base"; type: RECT;
188 scale: 1; 188 scale: 1;
189 description { state: "default" 0.0; 189 description { state: "default" 0.0;
190 min: 240 0; 190 min: 240 0;
191 color_class: "popup_bg";
191 } 192 }
192 } 193 }
193 part { name: "elm.bg.title"; type: RECT; 194 part { name: "elm.bg.title"; type: RECT;
@@ -195,7 +196,7 @@ group { name: "elm/popup/base/default";
195 fixed: 1 1; 196 fixed: 1 1;
196 rel1.to: "elm.text.title"; 197 rel1.to: "elm.text.title";
197 rel2.to: "elm.text.title"; 198 rel2.to: "elm.text.title";
198 visible: 0; 199 color_class: "popup_title_bg";
199 } 200 }
200 } 201 }
201 part { name: "elm.text.title"; type: TEXTBLOCK; 202 part { name: "elm.text.title"; type: TEXTBLOCK;