kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

theme: unify tags macro. 

As all the tags are now different from enabled and disabled we don't need the COMMON_ macro
This commit is contained in:
Davide Andreoli 2014-02-15 14:15:17 +01:00
parent 4ae7078e0f
commit 4c0f458f25
2 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/elementary/data/themes/edc/elm/entry.edc
View File

@ -440,17 +440,14 @@ group { name: "elm/entry/base/default";
styles {
style { name: "entry_style";
base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=word text_class=entry color_class=entry left_margin=2 right_margin=2";
COMMON_TEXTBLOCK_TAGS
ENABLED_TEXTBLOCK_TAGS
}
style { name: "entry_disabled_style";
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";
DISABLED_COMMON_TEXTBLOCK_TAGS
DISABLED_TEXTBLOCK_TAGS
}
style { name: "entry_guide_style";
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";
DISABLED_COMMON_TEXTBLOCK_TAGS
DISABLED_TEXTBLOCK_TAGS
}
}
@ -559,17 +556,14 @@ group { name: "elm/entry/base-mixedwrap/default";
styles {
style { name: "entry_style_mixedwrap";
base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=mixed text_class=entry color_class=entry left_margin=2 right_margin=2";
COMMON_TEXTBLOCK_TAGS
ENABLED_TEXTBLOCK_TAGS
}
style { name: "entry_disabled_style_mixedwrap";
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";
DISABLED_COMMON_TEXTBLOCK_TAGS
DISABLED_TEXTBLOCK_TAGS
}
style { name: "entry_guide_style_mixedwrap";
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";
DISABLED_COMMON_TEXTBLOCK_TAGS
DISABLED_TEXTBLOCK_TAGS
}
}
@ -612,17 +606,14 @@ group { name: "elm/entry/base-charwrap/default";
styles {
style { name: "entry_style_charwrap";
base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=char text_class=entry color_class=entry left_margin=2 right_margin=2";
COMMON_TEXTBLOCK_TAGS
ENABLED_TEXTBLOCK_TAGS
}
style { name: "entry_disabled_style_charwrap";
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";
DISABLED_COMMON_TEXTBLOCK_TAGS
DISABLED_TEXTBLOCK_TAGS
}
style { name: "entry_guide_style_charwrap";
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";
DISABLED_COMMON_TEXTBLOCK_TAGS
DISABLED_TEXTBLOCK_TAGS
}
}
@ -700,17 +691,14 @@ group { name: "elm/entry/base-single/default";
styles {
style { name: "entry_single_style";
base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=none text_class=entry color_class=entry left_margin=2 right_margin=2";
COMMON_TEXTBLOCK_TAGS
ENABLED_TEXTBLOCK_TAGS
}
style { name: "entry_single_disabled_style";
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";
DISABLED_COMMON_TEXTBLOCK_TAGS
DISABLED_TEXTBLOCK_TAGS
}
style { name: "entry_single_guide_style";
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";
DISABLED_COMMON_TEXTBLOCK_TAGS
DISABLED_TEXTBLOCK_TAGS
}
}

48
legacy/elementary/data/themes/fonts.edc
View File

@ -20,14 +20,24 @@
#define FN_COL_DISABLE 21 21 21 255; color3: 255 255 255 25;
#define COMMON_TEXTBLOCK_TAGS \
#define ENABLED_TEXTBLOCK_TAGS \
tag: "em" "+ font_style=Oblique"; \
tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff80"; \
tag: "link" "+ color=#3399ff underline=on underline_color=#3399ff"; \
tag: "preedit" "+ underline=on underline_color=#3399ff"; \
tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#ffffff"; \
tag: "title" "+ font_size=26"; \
tag: "subtitle" "+ font_size=18"; \
tag: "bigger" "+ font_size=12"; \
tag: "big" "+ font_size=11"; \
tag: "small" "+ font_size=8"; \
tag: "smaller" "+ font_size=7"; \
tag: "name" "+ color=#888888 font_weight=Bold"; \
tag: "val" "+ color=#ffffff"; \
tag: "info" "+ color=#3399ff style=glow glow_color=#3399ff30"; \
tag: "success" "+ color=#00ff00 style=glow glow_color=#00ff0030"; \
tag: "warning" "+ color=#ff7c00 style=glow glow_color=#ff7c0030"; \
tag: "failure" "+ color=#ff0000 style=glow glow_color=#ff000030"; \
tag: "code" "+ font=Mono style=plain color=#ffffff"; \
tag: "comment" "+ color=#00B000"; \
tag: "string" "+ color=#ff3a35"; \
@ -43,14 +53,24 @@
tag: "line_removed" "+ color=#ff3a35"; \
tag: "line_changed" "+ color=#ff9900";
#define DISABLED_COMMON_TEXTBLOCK_TAGS \
#define DISABLED_TEXTBLOCK_TAGS \
tag: "em" "+ font_style=Oblique"; \
tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff20"; \
tag: "link" "+ color=#101820 shadow_color=#66aaff28 underline=on underline_color=#101820"; \
tag: "preedit" "+ underline=on underline_color=#3399ff88"; \
tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#888888"; \
tag: "title" "+ font_size=26"; \
tag: "subtitle" "+ font_size=18"; \
tag: "bigger" "+ font_size=12"; \
tag: "big" "+ font_size=11"; \
tag: "small" "+ font_size=8"; \
tag: "smaller" "+ font_size=7"; \
tag: "name" "+ color=#151515 font_weight=Bold"; \
tag: "val" "+ color=#151515"; \
tag: "info" "+ color=#3399ff60 style=glow glow_color=#3399ff18"; \
tag: "success" "+ color=#00ff0060 style=glow glow_color=#00ff0018"; \
tag: "warning" "+ color=#ff7c0060 style=glow glow_color=#ff7c0018"; \
tag: "failure" "+ color=#ff000060 style=glow glow_color=#ff000018"; \
tag: "code" "+ style=shadow,bottom shadow_color=#ffffff19 font=Mono color=#151515"; \
tag: "comment" "+ color=#002800"; \
tag: "string" "+ color=#300504"; \
@ -65,27 +85,3 @@
tag: "line_added" "+ color=#002800"; \
tag: "line_removed" "+ color=#300504"; \
tag: "line_changed" "+ color=#201200";
#define ENABLED_TEXTBLOCK_TAGS \
tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff80"; \
tag: "link" "+ color=#3399ff underline=on underline_color=#3399ff"; \
tag: "preedit" "+ underline=on underline_color=#3399ff"; \
tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#ffffff"; \
tag: "name" "+ color=#888888 font_weight=Bold"; \
tag: "val" "+ color=#ffffff"; \
tag: "info" "+ color=#3399ff style=glow glow_color=#3399ff30"; \
tag: "success" "+ color=#00ff00 style=glow glow_color=#00ff0030"; \
tag: "warning" "+ color=#ff7c00 style=glow glow_color=#ff7c0030"; \
tag: "failure" "+ color=#ff0000 style=glow glow_color=#ff000030";
#define DISABLED_TEXTBLOCK_TAGS \
tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff20"; \
tag: "link" "+ color=#101820 shadow_color=#66aaff28 underline=on underline_color=#101820"; \
tag: "preedit" "+ underline=on underline_color=#3399ff88"; \
tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#888888"; \
tag: "name" "+ color=#151515 font_weight=Bold"; \
tag: "val" "+ color=#151515"; \
tag: "info" "+ color=#3399ff60 style=glow glow_color=#3399ff18"; \
tag: "success" "+ color=#00ff0060 style=glow glow_color=#00ff0018"; \
tag: "warning" "+ color=#ff7c0060 style=glow glow_color=#ff7c0018"; \
tag: "failure" "+ color=#ff000060 style=glow glow_color=#ff000018";