Merge remote-tracking branch 'remotes/origin/upstream'

[framework/uifw/elementary.git] / data / themes / widgets / entry.edc

diff --git a/data/themes/widgets/entry.edc b/data/themes/widgets/entry.edc
index 1e0ae9c..114c8f3 100644 (file)
--- a/data/themes/widgets/entry.edc
+++ b/data/themes/widgets/entry.edc
@@ -41,6 +41,10 @@ group { name: "elm/scroller/entry/default";
          description { state: "default" 0.0;
             rel1.offset: 2 2;
             rel2.offset: -3 -3;
+<<<<<<< HEAD
+=======
+            color: 255 255 255 0;
+>>>>>>> remotes/origin/upstream
          }
       }
       part { name: "clipper";
@@ -702,7 +706,11 @@ group { name: "elm/entry/base/default";
    styles
    {
       style { name: "entry_textblock_style";
+<<<<<<< HEAD
          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";
+>>>>>>> remotes/origin/upstream
          tag:  "em" "+ font_style=Oblique";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
          tag:  "hilight" "+ font_weight=Bold";
@@ -710,7 +718,11 @@ group { name: "elm/entry/base/default";
          tag:  "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF";
       }
       style { name: "entry_textblock_disabled_style";
+<<<<<<< HEAD
          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";
+>>>>>>> remotes/origin/upstream
          tag:  "em" "+ font_style=Oblique";
          tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
          tag:  "hilight" "+ font_weight=Bold";
@@ -780,7 +792,11 @@ group { name: "elm/entry/base-mixedwrap/default";
    styles
    {
       style { name: "entry_textblock_style_mixedwrap";
+<<<<<<< HEAD
          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";
+>>>>>>> remotes/origin/upstream
          tag:  "em" "+ font_style=Oblique";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
          tag:  "hilight" "+ font_weight=Bold";
@@ -788,7 +804,11 @@ group { name: "elm/entry/base-mixedwrap/default";
          tag:  "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF";
       }
       style { name: "entry_textblock_disabled_style_mixedwrap";
+<<<<<<< HEAD
          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";
+>>>>>>> remotes/origin/upstream
          tag:  "em" "+ font_style=Oblique";
          tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
          tag:  "hilight" "+ font_weight=Bold";
@@ -822,7 +842,11 @@ group { name: "elm/entry/base-charwrap/default";
    styles
    {
       style { name: "entry_textblock_style_charwrap";
+<<<<<<< HEAD
          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";
+>>>>>>> remotes/origin/upstream
          tag:  "em" "+ font_style=Oblique";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
          tag:  "hilight" "+ font_weight=Bold";
@@ -830,7 +854,11 @@ group { name: "elm/entry/base-charwrap/default";
          tag:  "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF";
       }
       style { name: "entry_textblock_disabled_style_charwrap";
+<<<<<<< HEAD
          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";
+>>>>>>> remotes/origin/upstream
          tag:  "em" "+ font_style=Oblique";
          tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
          tag:  "hilight" "+ font_weight=Bold";
@@ -886,7 +914,11 @@ group { name: "elm/entry/base-single/default";
    styles
    {
       style { name: "entry_single_textblock_style";
+<<<<<<< HEAD
          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";
+>>>>>>> remotes/origin/upstream
          tag:  "em" "+ font_style=Oblique";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
          tag:  "hilight" "+ font_weight=Bold";
@@ -894,7 +926,11 @@ group { name: "elm/entry/base-single/default";
          tag:  "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF";
       }
       style { name: "entry_single_textblock_disabled_style";
+<<<<<<< HEAD
          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";
+>>>>>>> remotes/origin/upstream
          tag:  "em" "+ font_style=Oblique";
          tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
          tag:  "hilight" "+ font_weight=Bold";