change font to BreezeSans

Change-Id: Ida5415ce50fb2db7cbfe9d5b645d17df1e2c269f
Signed-off-by: Soohye Shin <soohye.shin@samsung.com>

diff --git a/edje/view/actionmenu.edc b/edje/view/actionmenu.edc
index dfdebcc..9083f71 100644 (file)
--- a/edje/view/actionmenu.edc
+++ b/edje/view/actionmenu.edc
@@ -279,7 +279,7 @@ group {
                        description {
                                state, "default" 0.0;
                                text {
-                                       font, "TizenSans";
+                                       font, FONT_LIGHT;
                                        size, 28;
                                        text, "Live TV";
                                }

diff --git a/edje/view/home.edc b/edje/view/home.edc
index 31e80f9..b8d649e 100644 (file)
--- a/edje/view/home.edc
+++ b/edje/view/home.edc
@@ -233,7 +233,7 @@ group {
                                fixed, 1 1;
                                text {
                                        size, 31;
-                                       font, "TizenSans";
+                                       font, FONT_REGULAR;
                                        text, "Recent";
                                }
                                color, 255 255 255 178;
@@ -377,7 +377,7 @@ group {
                                fixed, 1 1;
                                text {
                                        size, 31;
-                                       font, "TizenSans";
+                                       font, FONT_REGULAR;
                                        text, "ETG";
                                }
                                color, 255 255 255 178;
@@ -552,7 +552,7 @@ group {
                                fixed, 1 1;
                                text {
                                        size, 24;
-                                       font, "TizenSans";
+                                       font, FONT_LIGHT;
                                }
                                color, 255 255 255 255;
                        }

diff --git a/edje/view/photo.edc b/edje/view/photo.edc
index bdf7c10..3facbcc 100644 (file)
--- a/edje/view/photo.edc
+++ b/edje/view/photo.edc
@@ -42,7 +42,7 @@ group {
                                text {
                                        text, "Select photo";
                                        size, 46;
-                                       font, "TizenSans";
+                                       font, FONT_REGULAR;
                                }
                                color, 51 51 51 255;
                        }
@@ -134,7 +134,7 @@ group {
                                state, "default" 0.0;
                                fixed, 1 1;
                                text {
-                                       font, "TizenSans";
+                                       font, FONT_LIGHT;
                                        size, 32;
                                        text, "No content";
                                }
@@ -185,7 +185,7 @@ group {
                                fixed, 1 1;
                                align, 0.5 0.0;
                                text {
-                                       font, "TizenSans";
+                                       font, FONT_LIGHT;
                                        size, 42;
                                        text, "Preview image";
                                }

diff --git a/edje/view/recent.edc b/edje/view/recent.edc
index bff28d6..c4448a2 100644 (file)
--- a/edje/view/recent.edc
+++ b/edje/view/recent.edc
@@ -130,7 +130,7 @@ group {
                                rel2.to, "pad.title";
                                text {
                                        size, 46;
-                                       font, "TizenSans";
+                                       font, FONT_REGULAR;
                                        text, "Recent";
                                }
                                color, 51 51 51 255;
@@ -200,7 +200,7 @@ group {
                                }
                                text {
                                        size, 32;
-                                       font, "TizenSans";
+                                       font, FONT_LIGHT;
                                }
                                fixed, 1 1;
                                color, 0 0 0 178;

diff --git a/edje/view/user.edc b/edje/view/user.edc
index d109b5e..8ee3373 100644 (file)
--- a/edje/view/user.edc
+++ b/edje/view/user.edc
@@ -57,11 +57,11 @@ group {
                                align, 0.5 1.0;
                                text {
                                        text, "Switch User";
-                                       font, "TizenSans";
+                                       font, FONT_REGULAR;
                                        size, 34;
                                }
                                color, 0 0 0 0;
-                               color2, 0 0 0 255;
+                               color3, 0 0 0 78;
                        }
                        description {
                                state, "show" 0.0;
@@ -321,11 +321,12 @@ group {
                                align, 0.5 0.0;
                                fixed, 1 1;
                                text {
-                                       size, 26;
-                                       font, "TizenSans";
+                                       size, 24;
+                                       font, FONT_REGULAR;
                                        text, "Edit";
                                }
-                               color, 255 255 255 178;
+                               color, 255 255 255 255;
+                               color3, 0 0 0 125;
                                visible, 0;
                        }
                        description {

diff --git a/edje/view/useredit.edc b/edje/view/useredit.edc
index e07e775..258ef38 100644 (file)
--- a/edje/view/useredit.edc
+++ b/edje/view/useredit.edc
@@ -40,7 +40,7 @@ group {
                                fixed, 1 1;
                                text {
                                        size, 46;
-                                       font, "TizenSans";
+                                       font, FONT_REGULAR;
                                }
                                color, 51 51 51 255;
                        }
@@ -197,7 +197,7 @@ group {
                                fixed, 1 1;
                                align, 0.0 0.0;
                                text {
-                                       font, "TizenSans";
+                                       font, FONT_LIGHT;
                                        size, 32;
                                        text, "Photo";
                                        align, 0.0 0.5;
@@ -359,7 +359,7 @@ group {
                                fixed, 1 1;
                                align, 0.0 0.0;
                                text {
-                                       font, "TizenSans";
+                                       font, FONT_LIGHT;
                                        size, 24;
                                        align, 0.0 0.5;
                                        text, "Required fields";
@@ -405,7 +405,7 @@ group {
                                fixed, 1 1;
                                align, 0.0 0.0;
                                text {
-                                       font, "TizenSans";
+                                       font, FONT_LIGHT;
                                        size, 32;
                                        text, "Name";
                                        align, 0.0 0.5;
@@ -503,7 +503,7 @@ group {
                                fixed, 1 1;
                                align, 0.0 0.0;
                                text {
-                                       font, "TizenSans";
+                                       font, FONT_LIGHT;
                                        size, 32;
                                        text, "Pin code";
                                        align, 0.0 0.5;
@@ -585,7 +585,7 @@ group {
                                fixed, 1 1;
                                align, 0.0 0.0;
                                text {
-                                       font, "TizenSans";
+                                       font, FONT_LIGHT;
                                        size, 32;
                                        text, "Privacy lock";
                                        align, 0.0 0.5;

diff --git a/edje/widget/button.edc b/edje/widget/button.edc
index 4d57906..bbb817e 100644 (file)
--- a/edje/widget/button.edc
+++ b/edje/widget/button.edc
@@ -122,7 +122,7 @@ group {
                                align, 0.5 0.0;
                                color, 104 104 104 255;
                                text {
-                                       font, "TizenSans";
+                                       font, FONT_LIGHT;
                                        size, 20;
                                }
                        }

diff --git a/edje/widget/entry.edc b/edje/widget/entry.edc
index 366c7cc..37ecfd9 100644 (file)
--- a/edje/widget/entry.edc
+++ b/edje/widget/entry.edc
@@ -17,7 +17,7 @@
 styles {
        style {
                name, "entry_single_textblock_style";
-               base, "font=TizenSans font_size="32" align=left color=#cccccc wrap=none texti_class=entry left_margin=0 right_margin=0";
+               base, "font=BreezeSans:style=Light font_size="32" align=left color=#cccccc wrap=none texti_class=entry left_margin=0 right_margin=0";
                tag,  "br" "";
                tag,  "ps" "";
                tag,  "em" "+ font_style=Oblique";
@@ -28,7 +28,7 @@ styles {
        }
        style {
                name, "entry_single_textblock_selected_style";
-               base, "font=TizenSans font_size="32" align=left color=#0077f6 wrap=none text_class=entry left_margin=0 right_margin=0";
+               base, "font=BreezeSans:style=Light font_size="32" align=left color=#0077f6 wrap=none text_class=entry left_margin=0 right_margin=0";
                tag,  "br" "";
                tag,  "ps" "";
                tag,  "em" "+ font_style=Oblique";
@@ -39,7 +39,7 @@ styles {
        }
        style {
                name, "entry_single_textblock_disabled_style";
-               base, "font=TizenSans font_size="32" align=left color=#c8c8c8 wrap=none text_class=entry left_margin=0 right_margin=0";
+               base, "font=BreezeSans:style=Light font_size="32" align=left color=#c8c8c8 wrap=none text_class=entry left_margin=0 right_margin=0";
                tag,  "br" "";
                tag,  "ps" "";
                tag,  "em" "+ font_style=Oblique";
@@ -50,7 +50,7 @@ styles {
        }
        style {
                name, "entry_single_textblock_guide_style";
-               base, "font=TizenSans font_size="32" align=left color=#7f7f7f wrap=none text_class=entry left_margin=0 right_margin=0 ellipsis=0.0";
+               base, "font=BreezeSans:style=Light font_size="32" align=left color=#7f7f7f wrap=none text_class=entry left_margin=0 right_margin=0 ellipsis=0.0";
                tag,  "br" "";
                tag,  "ps" "";
                tag,  "em" "+ font_style=Oblique";
@@ -60,7 +60,7 @@ styles {
 styles {
        style {
                name, "entry_textblock_style";
-               base, "font=TizenSans font_size=32 align=left color=#cccccc wrap=none text_class=entry left_margin=0 right_margin=0";
+               base, "font=BreezeSans:style=Light font_size=32 align=left color=#cccccc wrap=none text_class=entry left_margin=0 right_margin=0";
                tag,  "em" "+ font_style=Oblique";
                tag,  "link" "+ color=#800 underline=on underline_color=#8008";
                tag,  "hilight" "+ font_weight=Bold";
@@ -69,7 +69,7 @@ styles {
        }
        style {
                name, "entry_textblock_selected_style";
-               base, "font=TizenSans font_size=32 align=left color=#0077f6 wrap=none text_class=entry left_margin=0 right_margin=0";
+               base, "font=BreezSans:style=Light font_size=32 align=left color=#0077f6 wrap=none text_class=entry left_margin=0 right_margin=0";
                tag,  "em" "+ font_style=Oblique";
                tag,  "link" "+ color=#800 underline=on underline_color=#8008";
                tag,  "hilight" "+ font_weight=Bold";
@@ -78,7 +78,7 @@ styles {
        }
        style {
                name, "entry_textblock_disabled_style";
-               base, "font=TizenSans font_size=32 align=left color=#3d3d3d wrap=none text_class=entry left_margin=0 right_margin=0";
+               base, "font=BreezeSans:style=Light font_size=32 align=left color=#3d3d3d wrap=none text_class=entry left_margin=0 right_margin=0";
                tag,  "em" "+ font_style=Oblique";
                tag,  "link" "+ color=#00000080 underline=on underline_color=#00000080";
                tag,  "hilight" "+ font_weight=Bold";
@@ -87,7 +87,7 @@ styles {
        }
        style {
                name, "entry_textblock_guide_style";
-               base, "font=TizenSans font_size=32 align=left color=#7f7f7f wrap=none text_class=entry left_margin=0 right_margin=0 ellipsis=0.0";
+               base, "font=BreezeSans:style=Light font_size=32 align=left color=#7f7f7f wrap=none text_class=entry left_margin=0 right_margin=0 ellipsis=0.0";
                tag,  "em" "+ font_style=Oblique";
                tag,  "hilight" "+ font_weight=Bold";
        }
@@ -95,7 +95,7 @@ styles {
 styles {
        style {
                name, "entry_pin_textblock_style";
-               base, "font=TizenSans font_size=32 align=center color=#3d3d3d wrap=none text_class=entry left_margin=0 right_margin=0";
+               base, "font=BreezeSans:style=Light font_size=32 align=center color=#3d3d3d wrap=none text_class=entry left_margin=0 right_margin=0";
                tag,  "em" "+ font_style=Oblique";
                tag,  "link" "+ color=#800 underline=on underline_color=#8008";
                tag,  "hilight" "+ font_weight=Bold";
@@ -104,7 +104,7 @@ styles {
        }
        style {
                name, "entry_pin_textblock_selected_style";
-               base, "font=TizenSans font_size=32 align=center color=#0077f6 wrap=none text_class=entry left_margin=0 right_margin=0";
+               base, "font=BreezeSans:style=Light font_size=32 align=center color=#0077f6 wrap=none text_class=entry left_margin=0 right_margin=0";
                tag,  "em" "+ font_style=Oblique";
                tag,  "link" "+ color=#800 underline=on underline_color=#8008";
                tag,  "hilight" "+ font_weight=Bold";
@@ -113,7 +113,7 @@ styles {
        }
        style {
                name, "entry_pin_textblock_disabled_style";
-               base, "font=TizenSans font_size=32 align=center color=#c8c8c8 wrap=none text_class=entry left_margin=0 right_margin=0";
+               base, "font=BreezeSans:style=Light font_size=32 align=center color=#c8c8c8 wrap=none text_class=entry left_margin=0 right_margin=0";
                tag,  "em" "+ font_style=Oblique";
                tag,  "link" "+ color=#00000080 underline=on underline_color=#00000080";
                tag,  "hilight" "+ font_weight=Bold";

diff --git a/edje/widget/label.edc b/edje/widget/label.edc
index 8fb0f85..9f05b9a 100644 (file)
--- a/edje/widget/label.edc
+++ b/edje/widget/label.edc
@@ -17,31 +17,31 @@
 styles {
        style {
                name, "home_label_title";
-               base, "font=TizenSans font_size=22 color=#686868 align=center";
+               base, "font=BreezeSans:style=Light font_size=22 color=#686868 align=center";
        }
        style {
                name, "home_label_title_focus";
-               base, "font=TizenSans font_size=22 color=#ffffff align=center";
+               base, "font=BreezeSans:style=Light font_size=22 color=#ffffff align=center";
        }
        style {
                name, "recent_label_title";
-               base, "font=TizenSans font_size=24 color=#ffffff align=left";
+               base, "font=BreezeSans:style=Light font_size=24 color=#ffffff align=left";
        }
        style {
                name, "recent_label_subtitle";
-               base, "font=TizenSans font_size=20 color=#cdcdcd align=left";
+               base, "font=BreezeSans:style=Light font_size=20 color=#cdcdcd align=left";
        }
        style {
                name, "action_menu_title";
-               base, "font=TizenSans font_size=20 color=#686868 align=center";
+               base, "font=BreezeSans:style=Light font_size=20 color=#686868 align=center";
        }
        style {
                name, "action_menu_title_focus";
-               base, "font=TizenSans font_size=20 color=#ffffff align=center";
+               base, "font=BreezeSans:style=Light font_size=20 color=#ffffff align=center";
        }
        style {
                name, "action_menu_title_dis";
-               base, "font=TizenSans font_size=20 color=#b3b3b3 align=center";
+               base, "font=BreezeSans:style=Light font_size=20 color=#b3b3b3 align=center";
        }
 }
 

diff --git a/edje/widget/notify.edc b/edje/widget/notify.edc
index 58a869f..4c36dec 100644 (file)
--- a/edje/widget/notify.edc
+++ b/edje/widget/notify.edc
@@ -17,7 +17,7 @@
 styles {
        style {
                name: "toast_style";
-               base: "font=TizenSans:style=Light font_size=28 align=center color=#515151";
+               base: "font=BreezeSans:style=Light font_size=28 align=center color=#515151";
                tag: "br" "\n";
                tag: "tab" "\t";
        }

diff --git a/include/defs.h b/include/defs.h
index 3a24413..740e1ca 100644 (file)
--- a/include/defs.h
+++ b/include/defs.h
@@ -242,4 +242,8 @@
 #define TAG_POPUP "popup"
 #define TAG_CTXPOPUP "ctxpopup"
 
+#define FONT_DEFAULT "BreezeSans"
+#define FONT_LIGHT "BreezeSans:style=Light"
+#define FONT_REGULAR "BreezeSans:style=Regular"
+
 #endif /* __AIR_HOME_DEFS_H__ */