diff options
author | JunsuChoi <jsuya.choi@samsung.com> | 2016-11-22 13:42:55 +0900 |
---|---|---|
committer | JunsuChoi <jsuya.choi@samsung.com> | 2017-06-02 09:13:53 +0900 |
commit | 463fd8f6aaa58bbe150f92a7e215ceb7cd932117 (patch) | |
tree | f12ddf31f86169c039b996452c80fc98e058a4ee | |
parent | 407d51a1585d3688d7d5ac250ed9768e2ba2858a (diff) | |
download | efl-theme-tizen-mobile-463fd8f6aaa58bbe150f92a7e215ceb7cd932117.tar.gz efl-theme-tizen-mobile-463fd8f6aaa58bbe150f92a7e215ceb7cd932117.tar.bz2 efl-theme-tizen-mobile-463fd8f6aaa58bbe150f92a7e215ceb7cd932117.zip |
Button : Add popup button color class and remove unused text style
Add popup button color class
*add color class
- button/popup/bg
- button/popup/bg_pressed
- button/popup/bg_disabled
- button/popup/text
- button/popup/text_pressed
- button/popup/text_disabled
- button/popup/effect
unused text style is removed
*remove text style
- button_trans
Change-Id: I639d77ff6352e93c50be2b503f15a01e11772870
-rw-r--r-- | mobile/HD-inc.edc | 35 | ||||
-rw-r--r-- | mobile/color_classes.edc | 20 | ||||
-rw-r--r-- | mobile/default/inc/tizen-default-inc.edc | 35 | ||||
-rw-r--r-- | mobile/widgets/button.edc | 30 |
4 files changed, 80 insertions, 40 deletions
diff --git a/mobile/HD-inc.edc b/mobile/HD-inc.edc index 62c03c6a..224c9d95 100644 --- a/mobile/HD-inc.edc +++ b/mobile/HD-inc.edc @@ -1254,26 +1254,6 @@ styles { // (Changeable UI) base: "font=Tizen:weight=Normal font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1P text_class=T051L1P ellipsis=1.0"; STYLE_TAGS } - style { name: "button_popup"; - base: "align=center color=#ffffffff font=Tizen:weight=Normal font_size=40 text_class=tizen ellipsis=1.0"; - // (Changeable UI) base: "font=Tizen:weight=Normal font_size="BUTTON_POPUP_TEXT_SIZE" align=center color=#ffffff color_class=T051L1 text_class=T051L1 ellipsis=1.0"; - STYLE_TAGS - } - style { name: "button_popup_dim"; - base: "align=center color=#ffffffff font=Tizen:weight=Normal font_size=40 text_class=tizen ellipsis=1.0"; - // (Changeable UI) base: "font=Tizen:weight=Normal font_size="BUTTON_POPUP_TEXT_SIZE" align=center color=#ffffff color_class=T051L1D text_class=T051L1D ellipsis=1.0"; - STYLE_TAGS - } - style { name: "button_popup_press"; - base: "align=center color=#ffffffff font=Tizen:weight=Normal font_size=40 text_class=tizen ellipsis=1.0"; - // (Changeable UI) base: "font=Tizen:weight=Normal font_size="BUTTON_POPUP_TEXT_SIZE" align=center color=#ffffff color_class=T051L1P text_class=T051L1P ellipsis=1.0"; - STYLE_TAGS - } - style { name: "button_trans"; - base: "color=#070707FF font=Tizen:weight=Normal font_size=27 text_class=tizen ellipsis=0.0"; - // (Changeable UI) base: "font=Tizen:weight=Normal font_size="BUTTON_TEXT_SIZE" color=#ffffff color_class=T1221 text_class=T1221 ellipsis=0.0"; - STYLE_TAGS - } style { name: "button_circle"; base: "align=center color=#FFFFFFFF font=Tizen:weight=Light font_size=32 text_class=tizen wrap=mixed ellipsis=1.0 color_class=button/circle/text"; // (Changeable UI) base: "font=Tizen:weight=Normal font_size="BUTTON_TEXT_CIRCLE_SIZE" align=center color=#ffffff color_class=T127 text_class=T127 wrap=mixed"; @@ -1304,6 +1284,21 @@ styles { // (Changeable UI) base: "font=Tizen:weight=Normal font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T051L2P text_class=T051L2P wrap=none ellipsis=1.0"; STYLE_TAGS } + style { name: "button_popup"; + base: "align=center color=#FFFFFFFF font=Tizen:weight=Light font_size=40 text_class=tizen ellipsis=1.0 color_class=button/popup/text"; + // (Changeable UI) base: "font=Tizen:weight=Normal font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1 text_class=T051L1 ellipsis=1.0"; + STYLE_TAGS + } + style { name: "button_popup_dim"; + base: "align=center color=#FFFFFFFF font=Tizen:weight=Light font_size=40 text_class=tizen ellipsis=1.0 color_class=button/popup/text_disabled"; + // (Changeable UI) base: "font=Tizen:weight=Normal font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1D text_class=T051L1D ellipsis=1.0"; + STYLE_TAGS + } + style { name: "button_popup_press"; + base: "align=center color=#FFFFFFFF font=Tizen:weight=Light font_size=40 text_class=tizen ellipsis=1.0 color_class=button/popup/text_pressed"; + // (Changeable UI) base: "font=Tizen:weight=Normal font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1P text_class=T051L1P ellipsis=1.0"; + STYLE_TAGS + } style { name: "button_naviframe_title_left_text_normal"; base: "color=#ffffffff align=left font=Tizen:weight=SemiBold:width=Condensed font_size=32 text_class=tizen wrap=mixed ellipsis=1.0 color_class=button/naviframe/title_left/text"; // (Changeable UI) base: "font=Samsung Condensed:weight=Normal font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T043 text_class=T043 wrap=none ellipsis=1.0"; diff --git a/mobile/color_classes.edc b/mobile/color_classes.edc index 08ac49c0..eeb585b7 100644 --- a/mobile/color_classes.edc +++ b/mobile/color_classes.edc @@ -115,6 +115,26 @@ color_classes { } color_class { "button/popup/opacity"; // Csharp Opacity Property color: 255 255 255 255; + color_class { "button/popup/bg"; + color: 78 97 173 255; + } + color_class { "button/popup/bg_pressed"; + color: 78 97 173 255; + } + color_class { "button/popup/bg_disabled"; + color: 131 145 201 255; + } + color_class { "button/popup/text"; + color: 250 250 250 255; + } + color_class { "button/popup/text_pressed"; + color: 250 250 250 255; + } + color_class { "button/popup/text_disabled"; + color: 250 250 250 163; + } + color_class { "button/popup/effect"; + color: 0 0 0 77; } color_class { "button/icon_reorder/bg"; color: 0 0 0 0; diff --git a/mobile/default/inc/tizen-default-inc.edc b/mobile/default/inc/tizen-default-inc.edc index 15511770..16937ffd 100644 --- a/mobile/default/inc/tizen-default-inc.edc +++ b/mobile/default/inc/tizen-default-inc.edc @@ -830,26 +830,6 @@ styles { // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1P text_class=T051L1P ellipsis=1.0"; STYLE_TAGS } - style { name: "button_popup"; - base: "align=center color=#ffffffff font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0"; - // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_POPUP_TEXT_SIZE" align=center color=#ffffff color_class=T051L1 text_class=T051L1 ellipsis=1.0"; - STYLE_TAGS - } - style { name: "button_popup_dim"; - base: "align=center color=#ffffff80 font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0"; - // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_POPUP_TEXT_SIZE" align=center color=#ffffff color_class=T051L1D text_class=T051L1D ellipsis=1.0"; - STYLE_TAGS - } - style { name: "button_popup_press"; - base: "align=center color=#ffffffff font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0"; - // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_POPUP_TEXT_SIZE" align=center color=#ffffff color_class=T051L1P text_class=T051L1P ellipsis=1.0"; - STYLE_TAGS - } - style { name: "button_trans"; - base: "color=#070707FF font=Tizen:style=Regular font_size=27 text_class=tizen ellipsis=0.0"; - // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff color_class=T1221 text_class=T1221 ellipsis=0.0"; - STYLE_TAGS - } style { name: "button_circle"; base: "align=center color=#4C4C4CFF font=Tizen:style=Regular font_size=24 text_class=tizen wrap=mixed"; // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_CIRCLE_SIZE" align=center color=#ffffff color_class=T127 text_class=T127 wrap=mixed"; @@ -870,6 +850,21 @@ styles { // (Changeable UI) base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE" color=#ffffff align=center color_class=T051L2P text_class=T051L2P wrap=none ellipsis=1.0"; STYLE_TAGS } + style { name: "button_popup"; + base: "align=center color=#FFFFFFFF font=Tizen:weight=Light font_size=40 text_class=tizen ellipsis=1.0 color_class=button/popup/text"; + // (Changeable UI) base: "font=Tizen:weight=Normal font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1 text_class=T051L1 ellipsis=1.0"; + STYLE_TAGS + } + style { name: "button_popup_dim"; + base: "align=center color=#FFFFFFFF font=Tizen:weight=Light font_size=40 text_class=tizen ellipsis=1.0 color_class=button/popup/text_disabled"; + // (Changeable UI) base: "font=Tizen:weight=Normal font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1D text_class=T051L1D ellipsis=1.0"; + STYLE_TAGS + } + style { name: "button_popup_press"; + base: "align=center color=#FFFFFFFF font=Tizen:weight=Light font_size=40 text_class=tizen ellipsis=1.0 color_class=button/popup/text_pressed"; + // (Changeable UI) base: "font=Tizen:weight=Normal font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class=T051L1P text_class=T051L1P ellipsis=1.0"; + STYLE_TAGS + } style { name: "check_popup"; base: "color=#070707FF font=Tizen:style=Regular font_size=30 text_class=label ellipsis=1.0"; // (Changeable UI) base: "font=Tizen:style=Regular font_size="CHECK_TEXT_FONT_SIZE_INC" color=#ffffff color_class=T023 text_class=T023 ellipsis=1.0"; diff --git a/mobile/widgets/button.edc b/mobile/widgets/button.edc index 33b0566c..e705db55 100644 --- a/mobile/widgets/button.edc +++ b/mobile/widgets/button.edc @@ -1809,6 +1809,36 @@ image.normal: "core_button_bg.#.png"; } } + rect { "clipper_bg"; + desc { "default"; + color_class: "button/popup/bg"; + } + desc { "pressed"; + color_class: "button/popup/bg_pressed"; + } + desc { "disabled"; + color_class: "button/popup/bg_disabled"; + } + } + rect { "clipper_bg_effect"; + desc { "default"; + color_class: "button/popup/effect"; + } + desc { "pressed"; + color: 255 255 255 255; + } + } + textblock { "elm.text"; + desc { "default"; + text.style: "button_popup"; + } + desc { "pressed"; + text.style: "button_popup_press"; + } + desc { "disabled"; + text.style: "button_popup_dim"; + } + } } } /* This transparent button style is used by applications which use webview. */ |