From 2a58a23a1cad7f555704f6bf2bf39b09df5ed91c Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 8 Feb 2012 14:07:36 +0000 Subject: [PATCH] Elm entry/label: Added left/right margins to default text themes. SVN revision: 67761 --- data/themes/widgets/entry.edc | 16 ++++++++-------- data/themes/widgets/label.edc | 10 ++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/data/themes/widgets/entry.edc b/data/themes/widgets/entry.edc index 1e0ae9c..d842d84 100644 --- a/data/themes/widgets/entry.edc +++ b/data/themes/widgets/entry.edc @@ -702,7 +702,7 @@ group { name: "elm/entry/base/default"; styles { style { name: "entry_textblock_style"; - base: "font=Sans font_size=10 color=#000 wrap=word text_class=entry"; + base: "font=Sans font_size=10 color=#000 wrap=word text_class=entry left_margin=4 right_margin=4"; tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#800 underline=on underline_color=#8008"; tag: "hilight" "+ font_weight=Bold"; @@ -710,7 +710,7 @@ group { name: "elm/entry/base/default"; tag: "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF"; } style { name: "entry_textblock_disabled_style"; - base: "font=Sans font_size=10 color=#00000080 wrap=word text_class=entry"; + base: "font=Sans font_size=10 color=#00000080 wrap=word text_class=entry left_margin=4 right_margin=4"; tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#00000080 underline=on underline_color=#00000080"; tag: "hilight" "+ font_weight=Bold"; @@ -780,7 +780,7 @@ group { name: "elm/entry/base-mixedwrap/default"; styles { style { name: "entry_textblock_style_mixedwrap"; - base: "font=Sans font_size=10 color=#000 wrap=mixed text_class=entry"; + base: "font=Sans font_size=10 color=#000 wrap=mixed text_class=entry left_margin=4 right_margin=4"; tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#800 underline=on underline_color=#8008"; tag: "hilight" "+ font_weight=Bold"; @@ -788,7 +788,7 @@ group { name: "elm/entry/base-mixedwrap/default"; tag: "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF"; } style { name: "entry_textblock_disabled_style_mixedwrap"; - base: "font=Sans font_size=10 color=#00000080 wrap=char text_class=entry"; + base: "font=Sans font_size=10 color=#00000080 wrap=char text_class=entry left_margin=4 right_margin=4"; tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#00000080 underline=on underline_color=#00000080"; tag: "hilight" "+ font_weight=Bold"; @@ -822,7 +822,7 @@ group { name: "elm/entry/base-charwrap/default"; styles { style { name: "entry_textblock_style_charwrap"; - base: "font=Sans font_size=10 color=#000 wrap=char text_class=entry"; + base: "font=Sans font_size=10 color=#000 wrap=char text_class=entry left_margin=4 right_margin=4"; tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#800 underline=on underline_color=#8008"; tag: "hilight" "+ font_weight=Bold"; @@ -830,7 +830,7 @@ group { name: "elm/entry/base-charwrap/default"; tag: "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF"; } style { name: "entry_textblock_disabled_style_charwrap"; - base: "font=Sans font_size=10 color=#00000080 wrap=char text_class=entry"; + base: "font=Sans font_size=10 color=#00000080 wrap=char text_class=entry left_margin=4 right_margin=4"; tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#00000080 underline=on underline_color=#00000080"; tag: "hilight" "+ font_weight=Bold"; @@ -886,7 +886,7 @@ group { name: "elm/entry/base-single/default"; styles { style { name: "entry_single_textblock_style"; - base: "font=Sans font_size=10 color=#000 wrap=none text_class=entry"; + base: "font=Sans font_size=10 color=#000 wrap=none text_class=entry left_margin=4 right_margin=4"; tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#800 underline=on underline_color=#8008"; tag: "hilight" "+ font_weight=Bold"; @@ -894,7 +894,7 @@ group { name: "elm/entry/base-single/default"; tag: "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF"; } style { name: "entry_single_textblock_disabled_style"; - base: "font=Sans font_size=10 color=#00000080 wrap=none text_class=entry"; + base: "font=Sans font_size=10 color=#00000080 wrap=none text_class=entry left_margin=4 right_margin=4"; tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#00000080 underline=on underline_color=#00000080"; tag: "hilight" "+ font_weight=Bold"; diff --git a/data/themes/widgets/label.edc b/data/themes/widgets/label.edc index cc190a8..fb3e643 100644 --- a/data/themes/widgets/label.edc +++ b/data/themes/widgets/label.edc @@ -6,12 +6,9 @@ group { name: "elm/label/base/default"; data.item: "max_font_size" "60"; styles { style { name: "textblock_style"; - base: "font=Sans font_size=10 color=#000 text_class=label"; - tag: "br" "\n"; - tag: "ps" "ps"; + base: "font=Sans font_size=10 color=#000 text_class=label left_margin=4 right_margin=4"; tag: "hilight" "+ font_weight=Bold"; tag: "b" "+ font_weight=Bold"; - tag: "tab" "\t"; } } parts { @@ -50,12 +47,9 @@ group { name: "elm/label/base/marker"; data.item: "max_font_size" "60"; styles { style { name: "textblock_style2"; - base: "font=Sans:style=Bold font_size=10 align=center color=#fff wrap=word text_class=label"; - tag: "br" "\n"; - tag: "ps" "ps"; + base: "font=Sans:style=Bold font_size=10 align=center color=#fff wrap=word text_class=label left_margin=4 right_margin=4"; tag: "hilight" "+ color=#ffff"; tag: "b" "+ color=#ffff"; - tag: "tab" "\t"; } } parts { -- 2.7.4