summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-02-11 16:56:54 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-02-11 16:56:54 +0900
commit94441a79a1686e6055a91e9b064c5db471925d82 (patch)
tree0899a86e313d517e0a92cac264c695845a3641e6
parent471c7323fcd43479b1bf28bf3bc513f929590c41 (diff)
theme - default styles - make disabled all look properly disabled
-rw-r--r--data/themes/edc/elm/entry.edc16
-rw-r--r--data/themes/fonts.edc51
2 files changed, 45 insertions, 22 deletions
diff --git a/data/themes/edc/elm/entry.edc b/data/themes/edc/elm/entry.edc
index 09c527bfa..a0ed2cd4f 100644
--- a/data/themes/edc/elm/entry.edc
+++ b/data/themes/edc/elm/entry.edc
@@ -441,12 +441,12 @@ group { name: "elm/entry/base/default";
441 } 441 }
442 style { name: "entry_disabled_style"; 442 style { name: "entry_disabled_style";
443 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry color_class=entry_disabled left_margin=2 right_margin=2"; 443 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry color_class=entry_disabled left_margin=2 right_margin=2";
444 COMMON_TEXTBLOCK_TAGS 444 DISABLED_COMMON_TEXTBLOCK_TAGS
445 DISABLED_TEXTBLOCK_TAGS 445 DISABLED_TEXTBLOCK_TAGS
446 } 446 }
447 style { name: "entry_guide_style"; 447 style { name: "entry_guide_style";
448 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0"; 448 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0";
449 COMMON_TEXTBLOCK_TAGS 449 DISABLED_COMMON_TEXTBLOCK_TAGS
450 DISABLED_TEXTBLOCK_TAGS 450 DISABLED_TEXTBLOCK_TAGS
451 } 451 }
452 } 452 }
@@ -560,12 +560,12 @@ group { name: "elm/entry/base-mixedwrap/default";
560 } 560 }
561 style { name: "entry_disabled_style_mixedwrap"; 561 style { name: "entry_disabled_style_mixedwrap";
562 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry color_class=entry_disabled left_margin=2 right_margin=2"; 562 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry color_class=entry_disabled left_margin=2 right_margin=2";
563 COMMON_TEXTBLOCK_TAGS 563 DISABLED_COMMON_TEXTBLOCK_TAGS
564 DISABLED_TEXTBLOCK_TAGS 564 DISABLED_TEXTBLOCK_TAGS
565 } 565 }
566 style { name: "entry_guide_style_mixedwrap"; 566 style { name: "entry_guide_style_mixedwrap";
567 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0"; 567 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0";
568 COMMON_TEXTBLOCK_TAGS 568 DISABLED_COMMON_TEXTBLOCK_TAGS
569 DISABLED_TEXTBLOCK_TAGS 569 DISABLED_TEXTBLOCK_TAGS
570 } 570 }
571 } 571 }
@@ -613,12 +613,12 @@ group { name: "elm/entry/base-charwrap/default";
613 } 613 }
614 style { name: "entry_disabled_style_charwrap"; 614 style { name: "entry_disabled_style_charwrap";
615 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry color_class=entry_disabled left_margin=2 right_margin=2"; 615 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry color_class=entry_disabled left_margin=2 right_margin=2";
616 COMMON_TEXTBLOCK_TAGS 616 DISABLED_COMMON_TEXTBLOCK_TAGS
617 DISABLED_TEXTBLOCK_TAGS 617 DISABLED_TEXTBLOCK_TAGS
618 } 618 }
619 style { name: "entry_guide_style_charwrap"; 619 style { name: "entry_guide_style_charwrap";
620 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0"; 620 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0";
621 COMMON_TEXTBLOCK_TAGS 621 DISABLED_COMMON_TEXTBLOCK_TAGS
622 DISABLED_TEXTBLOCK_TAGS 622 DISABLED_TEXTBLOCK_TAGS
623 } 623 }
624 } 624 }
@@ -701,12 +701,12 @@ group { name: "elm/entry/base-single/default";
701 } 701 }
702 style { name: "entry_single_disabled_style"; 702 style { name: "entry_single_disabled_style";
703 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry color_class=entry_disabled left_margin=2 right_margin=2"; 703 base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry color_class=entry_disabled left_margin=2 right_margin=2";
704 COMMON_TEXTBLOCK_TAGS 704 DISABLED_COMMON_TEXTBLOCK_TAGS
705 DISABLED_TEXTBLOCK_TAGS 705 DISABLED_TEXTBLOCK_TAGS
706 } 706 }
707 style { name: "entry_single_guide_style"; 707 style { name: "entry_single_guide_style";
708 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0"; 708 base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry color_class=entry_guide left_margin=2 right_margin=2 ellipsis=0.0";
709 COMMON_TEXTBLOCK_TAGS 709 DISABLED_COMMON_TEXTBLOCK_TAGS
710 DISABLED_TEXTBLOCK_TAGS 710 DISABLED_TEXTBLOCK_TAGS
711 } 711 }
712 } 712 }
diff --git a/data/themes/fonts.edc b/data/themes/fonts.edc
index fb8fae4d6..ce7441a31 100644
--- a/data/themes/fonts.edc
+++ b/data/themes/fonts.edc
@@ -37,32 +37,55 @@
37 tag: "class" "+ color=#72AAD4 font_weight=Bold"; \ 37 tag: "class" "+ color=#72AAD4 font_weight=Bold"; \
38 tag: "function" "+ color=#72AAD4 font_weight=Bold"; \ 38 tag: "function" "+ color=#72AAD4 font_weight=Bold"; \
39 tag: "param" "+ color=#ffffff"; \ 39 tag: "param" "+ color=#ffffff"; \
40 tag: "keyword" "+ color=#f90 font_weight=Bold"; \ 40 tag: "keyword" "+ color=#ff9900 font_weight=Bold"; \
41 tag: "preprocessor" "+ color=#3399ff font_weight=Bold"; \ 41 tag: "preprocessor" "+ color=#3399ff font_weight=Bold"; \
42 tag: "line_added" "+ color=#00B000"; \ 42 tag: "line_added" "+ color=#00B000"; \
43 tag: "line_removed" "+ color=#ff3a35"; \ 43 tag: "line_removed" "+ color=#ff3a35"; \
44 tag: "line_changed" "+ color=#f90"; 44 tag: "line_changed" "+ color=#ff9900";
45
46#define DISABLED_COMMON_TEXTBLOCK_TAGS \
47 tag: "em" "+ font_style=Oblique"; \
48 tag: "title" "+ font_size=26"; \
49 tag: "subtitle" "+ font_size=18"; \
50 tag: "bigger" "+ font_size=12"; \
51 tag: "big" "+ font_size=11"; \
52 tag: "small" "+ font_size=8"; \
53 tag: "smaller" "+ font_size=7"; \
54 tag: "code" "+ style=shadow,bottom shadow_color=#ffffff19 font=Mono color=#151515"; \
55 tag: "comment" "+ color=#002800"; \
56 tag: "string" "+ color=#300504"; \
57 tag: "number" "+ color=#202008 font_weight=Bold"; \
58 tag: "brace" "+ color=#000000"; \
59 tag: "type" "+ color=#101820"; \
60 tag: "class" "+ color=#121c20 font_weight=Bold"; \
61 tag: "function" "+ color=#121c20 font_weight=Bold"; \
62 tag: "param" "+ color=#151515"; \
63 tag: "keyword" "+ color=#201200 font_weight=Bold"; \
64 tag: "preprocessor" "+ color=#101820 font_weight=Bold"; \
65 tag: "line_added" "+ color=#002800"; \
66 tag: "line_removed" "+ color=#300504"; \
67 tag: "line_changed" "+ color=#201200";
45 68
46#define ENABLED_TEXTBLOCK_TAGS \ 69#define ENABLED_TEXTBLOCK_TAGS \
47 tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff80"; \ 70 tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff80"; \
48 tag: "link" "+ color=#3399ff underline=on underline_color=#3399ff"; \ 71 tag: "link" "+ color=#3399ff underline=on underline_color=#3399ff"; \
49 tag: "preedit" "+ underline=on underline_color=#3399ff"; \ 72 tag: "preedit" "+ underline=on underline_color=#3399ff"; \
50 tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#ffffff"; \ 73 tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#ffffff"; \
51 tag: "name" "+ color=#888888"; \ 74 tag: "name" "+ color=#888888 font_weight=Bold"; \
52 tag: "val" "+ color=#ffffff"; \ 75 tag: "val" "+ color=#ffffff"; \
53 tag: "info" "+ color=#3399ff style=glow glow_color=#3399ff40"; \ 76 tag: "info" "+ color=#3399ff style=glow glow_color=#3399ff30"; \
54 tag: "success" "+ color=#00cc00 style=glow glow_color=#00cc0040"; \ 77 tag: "success" "+ color=#00ff00 style=glow glow_color=#00ff0030"; \
55 tag: "warning" "+ color=#ff7c00 style=glow glow_color=#ff7c0040"; \ 78 tag: "warning" "+ color=#ff7c00 style=glow glow_color=#ff7c0030"; \
56 tag: "failure" "+ color=#ff0000 style=glow glow_color=#ff000040"; 79 tag: "failure" "+ color=#ff0000 style=glow glow_color=#ff000030";
57 80
58#define DISABLED_TEXTBLOCK_TAGS \ 81#define DISABLED_TEXTBLOCK_TAGS \
59 tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff20"; \ 82 tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff20"; \
60 tag: "link" "+ color=#3399ff88 underline=on underline_color=#3399ff88"; \ 83 tag: "link" "+ color=#101820 shadow_color=#66aaff28 underline=on underline_color=#101820"; \
61 tag: "preedit" "+ underline=on underline_color=#3399ff88"; \ 84 tag: "preedit" "+ underline=on underline_color=#3399ff88"; \
62 tag: "preedit_sel" "+ backing=on backing_color=#000 color=#888888"; \ 85 tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#888888"; \
63 tag: "name" "+ color=#666666"; \ 86 tag: "name" "+ color=#151515 font_weight=Bold"; \
64 tag: "val" "+ color=#151515"; \ 87 tag: "val" "+ color=#151515"; \
65 tag: "info" "+ color=#174878 style=glow glow_color=#17487820"; \ 88 tag: "info" "+ color=#3399ff60 style=glow glow_color=#3399ff18"; \
66 tag: "success" "+ color=#006600 style=glow glow_color=#00440020"; \ 89 tag: "success" "+ color=#00ff0060 style=glow glow_color=#00ff0018"; \
67 tag: "warning" "+ color=#703700 style=glow glow_color=#70370020"; \ 90 tag: "warning" "+ color=#ff7c0060 style=glow glow_color=#ff7c0018"; \
68 tag: "failure" "+ color=#660000 style=glow glow_color=#66000020"; 91 tag: "failure" "+ color=#ff000060 style=glow glow_color=#ff000018";