[Button] Apply UX 0.8 light theme.

Change-Id: I087ebde68f6b9ae4838e2627366efcd3eabe850f

diff --git a/themes/images/HD/dark/Controls/00_button_01.png b/themes/images/HD/dark/Controls/00_button_01.png
old mode 100755 (executable)
new mode 100644 (file)
index a86bff0..0b5b03e
Binary files a/themes/images/HD/dark/Controls/00_button_01.png and b/themes/images/HD/dark/Controls/00_button_01.png differ

diff --git a/themes/images/HD/dark/Controls/00_button_01_delete.png b/themes/images/HD/dark/Controls/00_button_01_delete.png
index 09630c6..d91a118 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_button_01_delete.png and b/themes/images/HD/dark/Controls/00_button_01_delete.png differ

diff --git a/themes/images/HD/dark/Controls/00_button_01_delete_dim.png b/themes/images/HD/dark/Controls/00_button_01_delete_dim.png
index f66465f..6f712bf 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_button_01_delete_dim.png and b/themes/images/HD/dark/Controls/00_button_01_delete_dim.png differ

diff --git a/themes/images/HD/dark/Controls/00_button_01_delete_press.png b/themes/images/HD/dark/Controls/00_button_01_delete_press.png
index 321e484..6d3bce7 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_button_01_delete_press.png and b/themes/images/HD/dark/Controls/00_button_01_delete_press.png differ

diff --git a/themes/images/HD/dark/Controls/00_button_01_dim.png b/themes/images/HD/dark/Controls/00_button_01_dim.png
index 86e1599..3c7ff94 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_button_01_dim.png and b/themes/images/HD/dark/Controls/00_button_01_dim.png differ

diff --git a/themes/images/HD/dark/Controls/00_button_01_focus.png b/themes/images/HD/dark/Controls/00_button_01_focus.png
old mode 100755 (executable)
new mode 100644 (file)
index 2d02de8..6541cf2
Binary files a/themes/images/HD/dark/Controls/00_button_01_focus.png and b/themes/images/HD/dark/Controls/00_button_01_focus.png differ

diff --git a/themes/images/HD/dark/Controls/00_button_01_press.png b/themes/images/HD/dark/Controls/00_button_01_press.png
old mode 100755 (executable)
new mode 100644 (file)
index d899bc1..9bf4539
Binary files a/themes/images/HD/dark/Controls/00_button_01_press.png and b/themes/images/HD/dark/Controls/00_button_01_press.png differ

diff --git a/themes/images/HD/dark/Controls/00_button_01_send.png b/themes/images/HD/dark/Controls/00_button_01_send.png
index bc58cb5..a428276 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_button_01_send.png and b/themes/images/HD/dark/Controls/00_button_01_send.png differ

diff --git a/themes/images/HD/dark/Controls/00_button_01_send_dim.png b/themes/images/HD/dark/Controls/00_button_01_send_dim.png
index bc58cb5..4bc722f 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_button_01_send_dim.png and b/themes/images/HD/dark/Controls/00_button_01_send_dim.png differ

diff --git a/themes/images/HD/dark/Controls/00_button_01_send_press.png b/themes/images/HD/dark/Controls/00_button_01_send_press.png
index 6e80527..a20bf6e 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_button_01_send_press.png and b/themes/images/HD/dark/Controls/00_button_01_send_press.png differ

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 6eee097..29ce794 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -331,10 +331,6 @@
 #define GENLIST_LIST_READ_BG_COLOR                      1 1 1 255
 #define GENLIST_LIST_UNREAD_BG_COLOR                    0 0 0 255
 
-#define BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
-#define BUTTON_TEXT_SHADOW_DIM_COLOR_INC 255 255 255 255
-#define BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192
-
 #define BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#000000C0"
 #define BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC "#FFFFFFFF"
 #define BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000C0"
@@ -342,30 +338,27 @@
 #define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
 #define BUTTON_TICKER_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192
 
-#define BUTTON_NUMBER_TEXT_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_NUMBER_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_NUMBER_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_NUMBER_TEXT_DISABLE_VISIBLE_COLOR_INC 250 250 250 153
-
 #define BUTTON_NUMBER_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
 #define BUTTON_NUMBER_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_NUMBER_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
-#define BUTTON_NUMBER_TEXTBLOCK_DISABLE_VISIBLE_COLOR_INC "#FAFAFA99"
+#define BUTTON_NUMBER_TEXTBLOCK_DISABLE_VISIBLE_COLOR_INC "#FAFAFA80"
 
 #define BUTTON_NUMBER_ICON_NORMAL_COLOR_INC 250 250 250 255
 #define BUTTON_NUMBER_ICON_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_NUMBER_ICON_DISABLED_COLOR_INC 250 250 250 128
+#define BUTTON_NUMBER_ICON_DISABLED_COLOR_INC 250 250 250 153
+
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0"
 
-#define BUTTON_SEARCH_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_SEARCH_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_SEARCH_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_SEARCH_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 153
-#define BUTTON_SEARCH_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192
 
 #define BUTTON_SEARCH_BUTTON_SEND_NORMAL_COLOR_INC 250 250 250 255
 #define BUTTON_SEARCH_BUTTON_SEND_PRESSED_COLOR_INC 250 250 250 255
 #define BUTTON_SEARCH_BUTTON_SEND_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_SEARCH_BUTTON_SEND_DISABLED_COLOR_INC 250 250 250 153
+#define BUTTON_SEARCH_BUTTON_SEND_DISABLED_COLOR_INC 250 250 250 135
 #define BUTTON_SEARCH_BUTTON_SEND_SHADOW_NORMAL_COLOR_INC 0 0 0 192
 
 #define BUTTON_SEARCH_BUTTON_CANCEL_NORMAL_COLOR_INC 250 250 250 255
@@ -396,11 +389,6 @@
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA80"
 
-#define BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC 0 0 0 255
-#define BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC 0 0 0 128
-
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#000000FF"
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
@@ -419,29 +407,16 @@
 #define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
 #define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 128
 
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 128
-
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFA80"
 
-#define BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 255
-
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFAFF"
 
-#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
-#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192
-
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0"
 
@@ -459,7 +434,7 @@
 
 #define BUTTON_EDIT_STYLE_NORMAL_COLOR_INC 250 250 250 255
 #define BUTTON_EDIT_STYLE_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_EDIT_STYLE_DISABLED_COLOR_INC 250 250 250 128
+#define BUTTON_EDIT_STYLE_DISABLED_COLOR_INC 250 250 250 153
 
 #define BUTTON_CIRCLE_STYLE_MINUS_NORMAL_COLOR_INC 250 250 250 255
 #define BUTTON_CIRCLE_STYLE_MINUS_PRESSED_COLOR_INC 250 250 250 255

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index 29d318c..ad47eb7 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -332,10 +332,6 @@
 #define GENLIST_LIST_READ_BG_COLOR                      224 221 216 255
 #define GENLIST_LIST_UNREAD_BG_COLOR                    250 247 242 255
 
-#define BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_TEXT_SHADOW_DIM_COLOR_INC 250 250 250 255
-#define BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 255
-
 #define BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
 #define BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC "#FAFAFAFF"
 #define BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC "#000000FF"
@@ -343,11 +339,6 @@
 #define BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
 #define BUTTON_TICKER_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192
 
-#define BUTTON_NUMBER_TEXT_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_NUMBER_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_NUMBER_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_NUMBER_TEXT_DISABLE_VISIBLE_COLOR_INC 58 58 58 128
-
 #define BUTTON_NUMBER_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
 #define BUTTON_NUMBER_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_NUMBER_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
@@ -357,11 +348,12 @@
 #define BUTTON_NUMBER_ICON_PRESSED_COLOR_INC 250 250 250 255
 #define BUTTON_NUMBER_ICON_DISABLED_COLOR_INC 58 58 58 128
 
-#define BUTTON_SEARCH_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_SEARCH_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_SEARCH_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_SEARCH_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 128
-#define BUTTON_SEARCH_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 255
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFAFF"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000C0"
+#define BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000C0"
 
 #define BUTTON_SEARCH_BUTTON_SEND_NORMAL_COLOR_INC 250 250 250 255
 #define BUTTON_SEARCH_BUTTON_SEND_PRESSED_COLOR_INC 250 250 250 255
@@ -397,11 +389,6 @@
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC "#3A3A3A80"
 
-#define BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 128
-
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_POPUP_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
@@ -420,29 +407,16 @@
 #define BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
 #define BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 128
 
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC 58 58 58 128
-
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#3A3A3AFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#3A3A3A80"
 
-#define BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC 250 250 250 255
-#define BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC 250 250 250 255
-#define BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC 250 250 250 255
-#define BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC 250 250 250 255
-
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC "#FAFAFAFF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC "#FAFAFAFF"
 
-#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 0 0 0 192
-#define BUTTON_CONTACT_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC 0 0 0 192
-
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC "#000000FF"
 #define BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC "#000000FF"
 
@@ -460,7 +434,7 @@
 
 #define BUTTON_EDIT_STYLE_NORMAL_COLOR_INC 101 101 101 255
 #define BUTTON_EDIT_STYLE_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_EDIT_STYLE_DISABLED_COLOR_INC 101 101 101 76
+#define BUTTON_EDIT_STYLE_DISABLED_COLOR_INC 101 101 101 128
 
 #define BUTTON_CIRCLE_STYLE_MINUS_NORMAL_COLOR_INC 255 255 255 255
 #define BUTTON_CIRCLE_STYLE_MINUS_PRESSED_COLOR_INC 255 255 255 255
@@ -481,7 +455,7 @@
 #define BUTTON_DATETIME_AMPM_BG_MIN_INC 95 60
 #define BUTTON_DATETIME_AMPM_TEXT_FONT_SIZE_INC 34
 
-#define BUTTON_SEARCH_BUTTON_BG_BORDER_INC 13 13 13 13
+#define BUTTON_SEARCH_BUTTON_BG_BORDER_INC 13 13 15 15
 #define BUTTON_SEARCH_BUTTON_BG_MIN_INC 100 66
 #define BUTTON_SEARCH_BUTTON_VISIBLE_BG_MIN_INC 148 66
 #define BUTTON_SEARCH_BUTTON_ICONONLY_BG_MIN_INC 66 66

diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index fc75d96..536b2a1 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -58,6 +58,18 @@
             tag: "ps" "ps";
             tag: "tab" "\t";
          }
+         style { name: "btn_base_style1_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_style1_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -292,13 +304,17 @@
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_style1_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_focus";
+               }
             }
          }
          part { name: "over2";
@@ -561,13 +577,17 @@
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_style1_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_focus";
+               }
             }
          }
       }
@@ -648,13 +668,17 @@
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_style1_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_focus";
+               }
             }
          }
       }
@@ -729,13 +753,17 @@
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_style1_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_focus";
+               }
             }
          }
       }
@@ -745,34 +773,33 @@
    group { name: "elm/button/base/search_button/text";
       alias: "elm/button/base/searchbar/default";
       inherit: "elm/button/base/style1";
-      images {
-         image: "00_button_01.png" COMP;
-         image: "00_button_01_dim.png" COMP;
-         image: "00_button_01_press.png" COMP;
+      styles{
+         style { name: "btn_base_search";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               image {
-                  normal: "00_button_01.png";
-                  border: BUTTON_SEARCH_BUTTON_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-         }
          part { name: "bg";
             type: RECT;
             scale: 1;
@@ -791,9 +818,8 @@
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             clip_to: "clipper";
             scale: 1;
             description { state: "default" 0.0;
@@ -806,14 +832,11 @@
                rel2 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
-               }
-               color: BUTTON_SEARCH_BUTTON_TEXT_NORMAL_COLOR_INC;
+               } 
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC;
+                  style: "btn_base_search";
                   min: 0 0;
                   max: 1 0;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
@@ -823,21 +846,26 @@
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_SEARCH_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_SEARCH_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_search_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_focus";
+               }
             }
          }
       }
@@ -892,9 +920,8 @@
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             clip_to: "clipper";
             scale: 1;
             description { state: "default" 0.0;
@@ -908,14 +935,10 @@
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_SEARCH_BUTTON_SEND_NORMAL_COLOR_INC;
-               color2: BUTTON_SEARCH_BUTTON_SEND_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC;
+                  style: "btn_base_search";
                   min: 0 0;
                   max: 1 0;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
@@ -925,20 +948,26 @@
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_SEND_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_SEARCH_BUTTON_SEND_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_search_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_SEND_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_focus";
+               }
             }
          }
       }
@@ -993,9 +1022,8 @@
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             clip_to: "clipper";
             scale: 1;
             description { state: "default" 0.0;
@@ -1009,14 +1037,10 @@
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_SEARCH_BUTTON_CANCEL_NORMAL_COLOR_INC;
-               color2: BUTTON_SEARCH_BUTTON_CANCEL_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC;
+                  style: "btn_base_search";
                   min: 0 0;
                   max: 1 0;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
@@ -1026,20 +1050,26 @@
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_CANCEL_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_SEARCH_BUTTON_CANCEL_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_search_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_CANCEL_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_focus";
+               }
             }
          }
       }
@@ -2076,6 +2106,18 @@
             tag: "ps" "ps";
             tag: "tab" "\t";
          }
+         style { name: "btn_base_popup_button_dim";
+            base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_popup_button_focus";
+            base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -2239,15 +2281,19 @@
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_popup_button_dim";
+               }
                min: BUTTON_POPUP_TEXT_MIN_INC;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 0 0;
-               color: BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_popup_button_dim";
+                  min: 0 0;
+               }
             }
          }
          part { name: "over2";
@@ -3517,6 +3563,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             tag: "ps" "ps";
             tag: "tab" "\t";
          }
+         style { name: "btn_base_default_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_DEFAULT_STYLE_FONT_SIZE_INC" align=center color="BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_default_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_DEFAULT_STYLE_FONT_SIZE_INC" align=center color="BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -3688,15 +3746,19 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_default_dim";
+               }
                min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 0 0;
-               color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_default_focus";
+                  min: 0 0;
+               }
             }
          }
          part { name: "over2";
@@ -4224,6 +4286,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          image: "00_contacts_button.png" COMP;
          image: "00_contacts_button_press.png" COMP;
          image: "00_contacts_button_focus.png" COMP;
+         image: "00_contacts_button_dim.png" COMP;
       }
       styles{
          style { name: "btn_base_multibuttonentry";
@@ -4238,6 +4301,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             tag: "ps" "ps";
             tag: "tab" "\t";
          }
+         style { name: "btn_base_multibuttonentry_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_multibuttonentry_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -4267,6 +4342,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_contacts_button_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
@@ -4352,15 +4428,19 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
-               min: 1 1;
+               text {
+                  style: "btn_base_multibuttonentry_dim";
+                  min: 1 1;
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 1 1;
-               color: BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_multibuttonentry_focus";
+                  min: 1 1;
+               }
             }
          }
          part { name: "over1";
@@ -5808,6 +5888,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             tag: "ps" "ps";
             tag: "tab" "\t";
          }
+         style { name: "btn_base_exapandable_number_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC" align=center color="BUTTON_NUMBER_TEXTBLOCK_DISABLE_VISIBLE_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_exapandable_number_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC" align=center color="BUTTON_NUMBER_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -5959,11 +6051,15 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_NUMBER_TEXT_DISABLE_VISIBLE_COLOR_INC;
+               text {
+                  style: "btn_base_exapandable_number_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_NUMBER_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_exapandable_number_focus";
+               }
             }
          }
          part { name: "icon_clipper";