From: Tae-Hwan Kim Date: Fri, 21 Jun 2013 03:14:24 +0000 (+0900) Subject: [Check/Radio] Fix color X-Git-Tag: accepted/tizen/20131029.210118~137 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7bb79d7e5ee5d781fd7e28139ff9bf1de2805ac;p=profile%2Fivi%2Fefl-theme-tizen.git [Check/Radio] Fix color Change-Id: Ic74db26fda1e1ce9c97feef0905e6bff1b388e1f --- diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 76b7c22..e479733 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -767,13 +767,13 @@ #define BUTTON_DISCLIP_NORMAL_COLOR_INC 255 255 255 255 #define BUTTON_DISCLIP_DISABLED_COLOR_INC 255 255 255 76 -#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC 58 58 58 255 +#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC "#FFFFFF" #define CHECK_DEFAULT_TEXT_PRESSED_COLOR_INC 255 255 255 255 #define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC 58 58 58 76 #define CHECK_DISCLIP_NORMAL_COLOR_INC 255 255 255 255 #define CHECK_DISCLIP_DISABLED_COLOR_INC 255 255 255 76 -#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC 58 58 58 255 +#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC "#FFFFFF" #define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC 255 255 255 255 #define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC 58 58 58 76 #define RADIO_DISCLIP_NORMAL_COLOR_INC 255 255 255 255 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index 315b188..29d44f4 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -796,13 +796,13 @@ #define BUTTON_DISCLIP_NORMAL_COLOR_INC 255 255 255 255 #define BUTTON_DISCLIP_DISABLED_COLOR_INC 255 255 255 76 -#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC 58 58 58 255 +#define CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC "#3A3A3A" #define CHECK_DEFAULT_TEXT_PRESSED_COLOR_INC 255 255 255 255 #define CHECK_DEFAULT_TEXT_DISABLED_COLOR_INC 58 58 58 76 #define CHECK_DISCLIP_NORMAL_COLOR_INC 255 255 255 255 #define CHECK_DISCLIP_DISABLED_COLOR_INC 255 255 255 76 -#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC 58 58 58 255 +#define RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC "#3A3A3A" #define RADIO_DEFAULT_TEXT_PRESSED_COLOR_INC 255 255 255 255 #define RADIO_DEFAULT_TEXT_DISABLED_COLOR_INC 58 58 58 76 #define RADIO_DISCLIP_NORMAL_COLOR_INC 255 255 255 255 diff --git a/themes/widgets/check.edc b/themes/widgets/check.edc index 784e577..bfb8c57 100644 --- a/themes/widgets/check.edc +++ b/themes/widgets/check.edc @@ -170,7 +170,6 @@ style: "check_label_textblock_style"; \ min: 0 0; \ } \ - color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC; \ } \ description { state: "visible" 0.0; \ inherit: "default" 0.0; \ @@ -557,7 +556,6 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI style: "check_label_textblock_style"; \ min: 0 0; \ } \ - color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC; \ } \ description { state: "visible" 0.0; \ inherit: "default" 0.0; \ @@ -904,7 +902,6 @@ CHECK_STYLE_DEFAULT_GENLIST("default/genlist", CHECK_STYLE_DEFAULT_DEFAULT_BG_IM style: "check_label_textblock_style"; \ min: 0 0; \ } \ - color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC; \ } \ description { state: "visible" 0.0; \ inherit: "default" 0.0; \ @@ -1084,7 +1081,7 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ //////////////////////////////////////////////////////////////////////////////// styles { style { name: "check_label_textblock_style"; - base: "font=Tizen:style=Roman font_size="CHECK_DEFAULT_TEXT_FONT_SIZE_INC" color=#ffffff wrap=char text_class=tizen"; + base: "font=Tizen:style=Roman font_size="CHECK_DEFAULT_TEXT_FONT_SIZE_INC" color="CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC" wrap=char text_class=tizen"; tag: "br" "\n"; tag: "ps" "ps"; tag: "hilight" "+ font=Tizen:style=Bold"; @@ -1439,7 +1436,6 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ style: "check_label_textblock_style"; min: 0 0; } - color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -1811,7 +1807,6 @@ CHECK_STYLE_FOR_GENLIST("default/genlist_edit", CHECK_STYLE_FAVORITE_DEFAULT_BG_ style: "check_label_textblock_style"; \ min: 0 0; \ } \ - color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC; \ } \ description { state: "visible" 0.0; \ inherit: "default" 0.0; \ @@ -2126,7 +2121,6 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i style: "check_label_textblock_style"; min: 0 0; } - color: CHECK_DEFAULT_TEXT_NORMAL_COLOR_INC; } description { state: "visible" 0.0; inherit: "default" 0.0; diff --git a/themes/widgets/radio.edc b/themes/widgets/radio.edc index d9e1b79..f937e27 100644 --- a/themes/widgets/radio.edc +++ b/themes/widgets/radio.edc @@ -20,7 +20,7 @@ styles { style { name: "radio_label_textblock_style"; - base: "font=Tizen:style=Medium font_size="RADIO_STYLE_DEFAULT_FONT_SIZE_INC" color=#ffffff wrap=char text_class=tizen"; + base: "font=Tizen:style=Medium font_size="RADIO_STYLE_DEFAULT_FONT_SIZE_INC" color="RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC" wrap=char text_class=tizen"; tag: "br" "\n"; tag: "ps" "ps"; tag: "hilight" "+ font=Tizen:style=Bold"; @@ -170,7 +170,6 @@ style: "radio_label_textblock_style"; \ min: 0 0; \ } \ - color: RADIO_DEFAULT_TEXT_NORMAL_COLOR_INC; \ } \ description { state: "visible" 0.0; \ inherit: "default" 0.0; \