summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Pinot <ngc891@gmail.com>2014-01-02 11:10:41 +0900
committerJerome Pinot <ngc891@gmail.com>2014-01-02 11:10:41 +0900
commiteaea42300fdc9d5cd5b8666c729a3328d20d356a (patch)
treee19fdad574920c61d73d595425c11e8b8d4424b8
parentb48cdbc351c5eca47223f98db17a53a0924a15b8 (diff)
More fixes in edje themes, put default-small in sync.
-rw-r--r--data/themes/default/default-small.edc41
-rw-r--r--data/themes/default/default.edc14
-rw-r--r--data/themes/default/edc/colors.edc4
3 files changed, 35 insertions, 24 deletions
diff --git a/data/themes/default/default-small.edc b/data/themes/default/default-small.edc
index 9b51863..52abf90 100644
--- a/data/themes/default/default-small.edc
+++ b/data/themes/default/default-small.edc
@@ -5,8 +5,8 @@
5#include "edc/colors.edc" 5#include "edc/colors.edc"
6 6
7data { 7data {
8 item: "width" "720"; 8 item: "width" "800";
9 item: "height" "1280"; 9 item: "height" "600";
10} 10}
11 11
12collections { 12collections {
@@ -19,7 +19,7 @@ collections {
19 type: RECT; 19 type: RECT;
20 description { 20 description {
21 state: "default" 0.0; 21 state: "default" 0.0;
22 color: 255 255 255 0; 22 color_class: "trans";
23 rel1 { 23 rel1 {
24 relative: 0.0 0.0; 24 relative: 0.0 0.0;
25 offset: 0 0; 25 offset: 0 0;
@@ -30,9 +30,9 @@ collections {
30 } 30 }
31 } 31 }
32 description { 32 description {
33 state: "over" 0.0; 33 state: "over" 1.0;
34 inherit: "default" 0.0; 34 inherit: "default" 0.0;
35 color: 255 0 0 255; 35 color_class: "blue";
36 } 36 }
37 } 37 }
38 part { 38 part {
@@ -83,7 +83,7 @@ collections {
83 text { 83 text {
84 text: ""; 84 text: "";
85 font: "Sans"; 85 font: "Sans";
86 size: 14; 86 size: 12;
87 align: 0.0 0.0; 87 align: 0.0 0.0;
88 } 88 }
89 } 89 }
@@ -105,7 +105,7 @@ collections {
105 text { 105 text {
106 text: ""; 106 text: "";
107 font: "Serif"; 107 font: "Serif";
108 size: 20; 108 size: 16;
109 align: 0.5 0.5; 109 align: 0.5 0.5;
110 } 110 }
111 } 111 }
@@ -136,7 +136,7 @@ collections {
136 text { 136 text {
137 text: ""; 137 text: "";
138 font: "Sans"; 138 font: "Sans";
139 size: 10; 139 size: 9;
140 align: 1.0 1.0; 140 align: 1.0 1.0;
141 } 141 }
142 } 142 }
@@ -162,7 +162,7 @@ collections {
162 program { 162 program {
163 signal: "mouse,in"; 163 signal: "mouse,in";
164 source: "overlay"; 164 source: "overlay";
165 action: STATE_SET "over" 0.0; 165 action: STATE_SET "over" 1.0;
166 target: "border"; 166 target: "border";
167 transition: SINUSOIDAL 0.2; 167 transition: SINUSOIDAL 0.2;
168 } 168 }
@@ -257,11 +257,11 @@ collections {
257 name: "Number"; 257 name: "Number";
258 type: TEXT; 258 type: TEXT;
259 description { 259 description {
260 color: 255 255 255 255; 260 color_class: "blue";
261 text { 261 text {
262 text: ""; 262 text: "";
263 font: "Sans"; 263 font: "Sans";
264 size: 16; 264 size: 14;
265 align: 0.5 0.5; 265 align: 0.5 0.5;
266 } 266 }
267 } 267 }
@@ -271,11 +271,11 @@ collections {
271 type: TEXT; 271 type: TEXT;
272 description { 272 description {
273 state: "default" 0.0; 273 state: "default" 0.0;
274 color: 255 255 255 255; 274 color_class: "blue";
275 text { 275 text {
276 text: ""; 276 text: "";
277 font: "Sans"; 277 font: "Sans";
278 size: 10; 278 size: 9;
279 } 279 }
280 } 280 }
281 description { 281 description {
@@ -320,8 +320,7 @@ collections {
320 effect: SHADOW; 320 effect: SHADOW;
321 description { 321 description {
322 state: "default" 0.0; 322 state: "default" 0.0;
323 color: 255 255 255 255; 323 color_class: "blue";
324 color2: 100 100 100 60;
325 rel1 { 324 rel1 {
326 relative: 0.0 0.25; 325 relative: 0.0 0.25;
327 offset: 0 0; 326 offset: 0 0;
@@ -333,7 +332,7 @@ collections {
333 text { 332 text {
334 text: "ePeriodique"; 333 text: "ePeriodique";
335 font: "Serif"; 334 font: "Serif";
336 size: 20; 335 size: 16;
337 fit: 1 1; 336 fit: 1 1;
338 align: 0.5 0.5; 337 align: 0.5 0.5;
339 } 338 }
@@ -341,23 +340,27 @@ collections {
341 description { 340 description {
342 state: "over" 1.0; 341 state: "over" 1.0;
343 inherit: "default" 0.0; 342 inherit: "default" 0.0;
344 color: 200 10 180 255; 343 color_class: "magenta";
345 } 344 }
346 } 345 }
347 programs { 346 programs {
348 program { 347 program {
348 name: "light in";
349 signal: "mouse,in"; 349 signal: "mouse,in";
350 source: "Title"; 350 source: "Title";
351 filter: "Title" "default";
351 action: STATE_SET "over" 1.0; 352 action: STATE_SET "over" 1.0;
352 target: "Title";
353 transition: SINUSOIDAL 0.7; 353 transition: SINUSOIDAL 0.7;
354 target: "Title";
354 } 355 }
355 program { 356 program {
357 name: "light out";
356 signal: "mouse,out"; 358 signal: "mouse,out";
357 source: "Title"; 359 source: "Title";
360 filter: "Title" "over";
358 action: STATE_SET "default" 0.0; 361 action: STATE_SET "default" 0.0;
359 target: "Title";
360 transition: SINUSOIDAL 0.7; 362 transition: SINUSOIDAL 0.7;
363 target: "Title";
361 } 364 }
362 } 365 }
363 } 366 }
diff --git a/data/themes/default/default.edc b/data/themes/default/default.edc
index 2aa9792..2826a5e 100644
--- a/data/themes/default/default.edc
+++ b/data/themes/default/default.edc
@@ -31,7 +31,7 @@ collections {
31 } 31 }
32 } 32 }
33 description { 33 description {
34 state: "over" 0.0; 34 state: "over" 1.0;
35 inherit: "default" 0.0; 35 inherit: "default" 0.0;
36 color_class: "blue"; 36 color_class: "blue";
37 } 37 }
@@ -163,7 +163,7 @@ collections {
163 program { 163 program {
164 signal: "mouse,in"; 164 signal: "mouse,in";
165 source: "overlay"; 165 source: "overlay";
166 action: STATE_SET "over" 0.0; 166 action: STATE_SET "over" 1.0;
167 target: "border"; 167 target: "border";
168 transition: SINUSOIDAL 0.2; 168 transition: SINUSOIDAL 0.2;
169 } 169 }
@@ -341,23 +341,27 @@ collections {
341 description { 341 description {
342 state: "over" 1.0; 342 state: "over" 1.0;
343 inherit: "default" 0.0; 343 inherit: "default" 0.0;
344 color: 200 10 180 255; 344 color_class: "magenta";
345 } 345 }
346 } 346 }
347 programs { 347 programs {
348 program { 348 program {
349 name: "light in";
349 signal: "mouse,in"; 350 signal: "mouse,in";
350 source: "Title"; 351 source: "Title";
352 filter: "Title" "default";
351 action: STATE_SET "over" 1.0; 353 action: STATE_SET "over" 1.0;
352 target: "Title";
353 transition: SINUSOIDAL 0.7; 354 transition: SINUSOIDAL 0.7;
355 target: "Title";
354 } 356 }
355 program { 357 program {
358 name: "light out";
356 signal: "mouse,out"; 359 signal: "mouse,out";
357 source: "Title"; 360 source: "Title";
361 filter: "Title" "over";
358 action: STATE_SET "default" 0.0; 362 action: STATE_SET "default" 0.0;
359 target: "Title";
360 transition: SINUSOIDAL 0.7; 363 transition: SINUSOIDAL 0.7;
364 target: "Title";
361 } 365 }
362 } 366 }
363 } 367 }
diff --git a/data/themes/default/edc/colors.edc b/data/themes/default/edc/colors.edc
index 8d8a1e2..77a98d2 100644
--- a/data/themes/default/edc/colors.edc
+++ b/data/themes/default/edc/colors.edc
@@ -63,6 +63,10 @@ color_classes {
63 color: 51 152 253 255; 63 color: 51 152 253 255;
64 } 64 }
65 color_class { 65 color_class {
66 name: "magenta";
67 color: 255 0 147 255;
68 }
69 color_class {
66 name: "trans"; 70 name: "trans";
67 color: 0 0 0 0; 71 color: 0 0 0 0;
68 } 72 }