summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-24 14:29:45 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-24 14:29:45 +0900
commit2c0c5c6401f48502d428ef989b4864e9aac30ca7 (patch)
treef733757219070cfb376fd5115e6fb1d00c68f3b3
parentf918fe7f317b80a2d67fcecfb1c64f06aa08df15 (diff)
fix button color classes/colors after colorclass intro
-rw-r--r--data/themes/colorclasses.edc9
-rw-r--r--data/themes/edc/elm/button.edc18
2 files changed, 16 insertions, 11 deletions
diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index 6f57ccf13..72c74c341 100644
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -73,6 +73,15 @@ color_classes {
73 color_class { name: "button_text_disabled"; 73 color_class { name: "button_text_disabled";
74 color: FN_COL_DISABLE; 74 color: FN_COL_DISABLE;
75 } 75 }
76 color_class { name: "button_text_anchor";
77 color: FN_COL_HIGHLIGHT;
78 }
79 color_class { name: "button_text_anchor_clicked";
80 color: FN_COL_HIGHLIGHT_CLICKED;
81 }
82 color_class { name: "button_text_anchor_disabled";
83 color: FN_COL_HIGHLIGHT_DISABLE;
84 }
76 color_class { name: "check_text"; 85 color_class { name: "check_text";
77 color: FN_COL_DEFAULT; 86 color: FN_COL_DEFAULT;
78 } 87 }
diff --git a/data/themes/edc/elm/button.edc b/data/themes/edc/elm/button.edc
index e665457a5..8eb5bfdee 100644
--- a/data/themes/edc/elm/button.edc
+++ b/data/themes/edc/elm/button.edc
@@ -153,8 +153,8 @@ group { name: "elm/button/base/default";
153 rel1.to_y: "base"; 153 rel1.to_y: "base";
154 rel2.offset: -7 -7; 154 rel2.offset: -7 -7;
155 rel2.to: "base"; 155 rel2.to: "base";
156 color: FN_COL_DEFAULT;
157 color_class: "button_text"; 156 color_class: "button_text";
157 color3: 255 255 255 255;
158 text { font: FN; size: 10; 158 text { font: FN; size: 10;
159 align: 0.5 0.5; 159 align: 0.5 0.5;
160 min: 0 0; 160 min: 0 0;
@@ -176,15 +176,15 @@ group { name: "elm/button/base/default";
176 description { state: "disabled_visible" 0.0; 176 description { state: "disabled_visible" 0.0;
177 inherit: "default" 0.0; 177 inherit: "default" 0.0;
178 rel1.offset: 2 5; 178 rel1.offset: 2 5;
179 color: FN_COL_DISABLE;
180 color_class: "button_text_disabled"; 179 color_class: "button_text_disabled";
180 color3: 255 255 255 255;
181 text.min: 1 1; 181 text.min: 1 1;
182 visible: 1; 182 visible: 1;
183 } 183 }
184 description { state: "disabled_textonly" 0.0; 184 description { state: "disabled_textonly" 0.0;
185 inherit: "default" 0.0; 185 inherit: "default" 0.0;
186 color: FN_COL_DISABLE;
187 color_class: "button_text_disabled"; 186 color_class: "button_text_disabled";
187 color3: 255 255 255 255;
188 text.min: 1 1; 188 text.min: 1 1;
189 visible: 1; 189 visible: 1;
190 } 190 }
@@ -438,8 +438,9 @@ group { name: "elm/button/base/anchor";
438 rel1.to_y: "base"; 438 rel1.to_y: "base";
439 rel2.offset: -1 -1; 439 rel2.offset: -1 -1;
440 rel2.to: "base"; 440 rel2.to: "base";
441 color: FN_COL_HIGHLIGHT;
442 color_class: "button_text_anchor"; 441 color_class: "button_text_anchor";
442 color2: 255 255 255 255;
443 color3: 255 255 255 255;
443 text { font: FN; size: 10; 444 text { font: FN; size: 10;
444 align: 0.5 0.5; 445 align: 0.5 0.5;
445 min: 0 0; 446 min: 0 0;
@@ -461,18 +462,12 @@ group { name: "elm/button/base/anchor";
461 description { state: "disabled_visible" 0.0; 462 description { state: "disabled_visible" 0.0;
462 inherit: "default" 0.0; 463 inherit: "default" 0.0;
463 rel1.offset: 0 0; 464 rel1.offset: 0 0;
464 color: 51 153 255 128;
465 color2: 51 153 255 12;
466 color3: 51 153 255 8;
467 color_class: "button_text_anchor_disabled"; 465 color_class: "button_text_anchor_disabled";
468 text.min: 1 1; 466 text.min: 1 1;
469 visible: 1; 467 visible: 1;
470 } 468 }
471 description { state: "disabled_textonly" 0.0; 469 description { state: "disabled_textonly" 0.0;
472 inherit: "default" 0.0; 470 inherit: "default" 0.0;
473 color: 51 153 255 128;
474 color2: 51 153 255 12;
475 color3: 51 153 255 8;
476 color_class: "button_text_anchor_disabled"; 471 color_class: "button_text_anchor_disabled";
477 text.min: 1 1; 472 text.min: 1 1;
478 visible: 1; 473 visible: 1;
@@ -485,8 +480,9 @@ group { name: "elm/button/base/anchor";
485 fixed: 1 1; 480 fixed: 1 1;
486 rel1.to: "elm.text"; 481 rel1.to: "elm.text";
487 rel2.to: "elm.text"; 482 rel2.to: "elm.text";
488 color: FN_COL_HIGHLIGHT_CLICKED;
489 color_class: "button_text_anchor"; 483 color_class: "button_text_anchor";
484 color2: 255 255 255 255;
485 color3: 255 255 255 255;
490 text { font: FN; size: 10; 486 text { font: FN; size: 10;
491 text_source: "elm.text"; 487 text_source: "elm.text";
492 min: 1 1; 488 min: 1 1;