diff options
| author | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-04-29 08:33:43 (GMT) |
|---|---|---|
| committer | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-04-29 08:33:43 (GMT) |
| commit | 4e085efd845434aefe78dc5a93e63aa830cdf77c (patch) | |
| tree | e1c4f9f63eb9274296c53fc91b263056edf4f4e1 /data | |
| parent | 7d31447af8d2876f296be34e7f713b76d01a1de8 (diff) | |
| download | eulogium-4e085efd845434aefe78dc5a93e63aa830cdf77c.zip eulogium-4e085efd845434aefe78dc5a93e63aa830cdf77c.tar.gz eulogium-4e085efd845434aefe78dc5a93e63aa830cdf77c.tar.bz2 | |
Use colorclasses rather then directly setting the font.
This patch properly uses colorclasses to set the font color etc. It also
fixes a concistency typo for focus instead of focused.
Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>
Diffstat (limited to 'data')
| -rw-r--r-- | data/themes/default/colorclasses.edc | 2 | ||||
| -rw-r--r-- | data/themes/default/edc/elm/button.edc | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/data/themes/default/colorclasses.edc b/data/themes/default/colorclasses.edc index 03e8ca3..38e9784 100644 --- a/data/themes/default/colorclasses.edc +++ b/data/themes/default/colorclasses.edc @@ -78,7 +78,7 @@ color_classes { color_class { name: "button_text"; color: FN_COL_DEFAULT; } - color_class { name: "button_text_focused"; + color_class { name: "button_text_focus"; color: FN_COL_FOCUSED; } color_class { name: "button_text_disabled"; diff --git a/data/themes/default/edc/elm/button.edc b/data/themes/default/edc/elm/button.edc index 0ca594e..0e58608 100644 --- a/data/themes/default/edc/elm/button.edc +++ b/data/themes/default/edc/elm/button.edc @@ -173,13 +173,11 @@ group { name: "elm/button/base/default"; } description { state: "focus" 0.0; inherit: "default" 0.0; -// color_class: "button_text_focus"; - color: 0 0 0 255; + color_class: "button_text_focus"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - // color_class: "button_text_focus"; - color: 0 0 0 255; + color_class: "button_text_focus"; } description { state: "visible" 0.0; inherit: "default" 0.0; |