From 6a7174617c0e6b39c6e9be2a71526f8d7d989b72 Mon Sep 17 00:00:00 2001 From: "hjnim.kim" Date: Wed, 19 Jun 2013 16:28:48 +0900 Subject: [PATCH] Button: Apply white theme ( light theme ) Apply color code in button ( light theme ) Change-Id: Ia4e1be7cee7ac6bd13d8189a18f9e8746279f321 --- src/themes/tizen/common/jquery.mobile.button.less | 7 +- src/themes/tizen/tizen-black/style.less | 3 +- src/themes/tizen/tizen-white/style.less | 83 ++++++++++++----------- 3 files changed, 49 insertions(+), 44 deletions(-) diff --git a/src/themes/tizen/common/jquery.mobile.button.less b/src/themes/tizen/common/jquery.mobile.button.less index 4759134..7f06dcc 100644 --- a/src/themes/tizen/common/jquery.mobile.button.less +++ b/src/themes/tizen/common/jquery.mobile.button.less @@ -21,8 +21,8 @@ } /* wongi_1018 : For button align. */ .ui-btn.ui-btn-box-s { - color: @color_text; - text-shadow: @color_button_test_shadow; + color: @color_button_text_normal; + text-shadow: @color_button_text_shadow; .LESSborder-radius-all( 0.2rem ); } @@ -111,7 +111,8 @@ .ui-btn-box-s.ui-btn-down-s { background: @color_button_press; - box-shadow: @button_press_shadow_inner; + box-shadow: @button_shadow_inner; + text-shadow: none; } .ui-btn-corner-all { diff --git a/src/themes/tizen/tizen-black/style.less b/src/themes/tizen/tizen-black/style.less index 4f4b737..f1ec855 100644 --- a/src/themes/tizen/tizen-black/style.less +++ b/src/themes/tizen/tizen-black/style.less @@ -114,7 +114,7 @@ ***************************************************************************/ @color_button_text_black: rgb(186, 186, 186); -@color_button_test_shadow: 0px 1px rgb(17, 18, 20); +@color_button_text_shadow: 0px 1px rgb(17, 18, 20); @color_button_EditText: rgb(249, 249, 249); @color_button_EditTextPress: rgb(61, 61, 61); @@ -136,6 +136,7 @@ @color_button_inner_o: -o-linear-gradient(top, rgb(75, 77, 86), rgb(63, 65, 72)); @color_button_inner_ms: -ms-linear-gradient(top, rgb(75, 77, 86), rgb(63, 65, 72)); +@button_border_color: rgba( 133, 131, 126, 1); @button_shadow_outer: 1px 1px 2px rgba(19, 20, 23, 1); @button_shadow_inner: inset 0px 1px 1px rgba(122, 125, 134, 1); @button_press_shadow_inner: inset 0px 1px 1px rgba(22, 29, 95, 1); diff --git a/src/themes/tizen/tizen-white/style.less b/src/themes/tizen/tizen-white/style.less index fc95842..48c0cbd 100644 --- a/src/themes/tizen/tizen-white/style.less +++ b/src/themes/tizen/tizen-white/style.less @@ -114,47 +114,50 @@ Button(connected with other winset) ***************************************************************************/ +@color_button_text_shadow: 0px 1px rgb(255, 255, 255); + +@color_button_EditText: rgb(249, 249, 249); +@color_button_EditTextPress: rgb(61, 61, 61); + +@color_button_text_normal: rgb(58, 58, 58); /* F031L1 */ +@color_button_text_press: rgb(255, 255, 255); /* F031L1P */ @color_button_text_black: rgb(0, 0, 0); -@color_button_test_shadow: 0px 1px rgb(17, 18, 20); - -@color_button_EditText: rgb(249, 249, 249); -@color_button_EditTextPress: rgb(61, 61, 61); - -@color_button_text_normal: rgb(58, 58, 58); /* F031L1 */ -@color_button_text_press: rgb(255, 255, 255); /* F031L1P */ -@color_button_text_white: rgb(249, 249, 249); - -@color_button_normal: rgb(235, 232, 227); -@color_button_normal_webkit: -webkit-linear-gradient(top, rgb(235, 232, 227), rgb(234, 231, 226)); -@color_button_normal_moz: -moz-linear-gradient(top, rgb(235, 232, 227), rgb(234, 231, 226)); -@color_button_normal_o: -o-linear-gradient(top, rgb(235, 232, 227), rgb(234, 231, 226)); -@color_button_normal_ms: -ms-linear-gradient(top, rgb(235, 232, 227), rgb(234, 231, 226)); -@color_button_press: rgb(59, 115, 182); - -@color_button_inner: rgb(247, 245, 238); -@color_button_inner_webkit: -webkit-linear-gradient(top, rgb(250, 247, 242), rgb(248, 245, 240)); -@color_button_inner_moz: -moz-linear-gradient(top, rgb(250, 247, 242), rgb(248, 245, 240)); -@color_button_inner_o: -o-linear-gradient(top, rgb(250, 247, 242), rgb(248, 245, 240)); -@color_button_inner_ms: -ms-linear-gradient(top, rgb(250, 247, 242), rgb(248, 245, 240)); - -@button_shadow_outer: 0 0 1px 1px rgba(255, 255, 255, 1); -@button_shadow_inner: none; +@color_button_text_white: rgb(249, 249, 249); + +@color_button_normal: rgb(247, 245, 237); +@color_button_normal_webkit: -webkit-linear-gradient(top, rgb(247, 245, 237), rgb(236, 234, 226)); +@color_button_normal_moz: -moz-linear-gradient(top, rgb(247, 245, 237), rgb(236, 234, 226)); +@color_button_normal_o: -o-linear-gradient(top, rgb(247, 245, 237), rgb(236, 234, 226)); +@color_button_normal_ms: -ms-linear-gradient(top, rgb(247, 245, 237), rgb(236, 234, 226)); +@color_button_press: rgb(0, 122, 216); + +@color_button_inner: 0 0 1px 1px rgba(133, 131, 126, 1); +@color_button_inner_webkit: -webkit-linear-gradient(top, rgb(250, 247, 242), rgb(248, 245, 240)); +@color_button_inner_moz: -moz-linear-gradient(top, rgb(250, 247, 242), rgb(248, 245, 240)); +@color_button_inner_o: -o-linear-gradient(top, rgb(250, 247, 242), rgb(248, 245, 240)); +@color_button_inner_ms: -ms-linear-gradient(top, rgb(250, 247, 242), rgb(248, 245, 240)); + +@button_border_color: rgba( 133, 131, 126, 1); +@button_shadow_outer: 0 0 1px 1px rgba(133, 131, 126, 1); +@button_shadow_inner: 0.5px 1px 1px rgba(133, 131, 126, 1); @button_press_shadow_inner: inset 0px 1px 1px rgba(22, 29, 95, 1); @color_button_edit: rgb(201, 88, 88); @color_button_edit_webkit: -webkit-gradient(linear, left top, left bottom, from(rgb(201, 88, 88)), to(rgb(161, 40, 40))); @color_button_edit_moz: -moz_linear-gradient(top, rgb(201, 88, 88), rgb(161, 40, 40)); @color_button_inner_border: rgba(199, 197, 190, 1); + .LESSbutton_box_style{ - color: @color_button_text_normal; + color: @color_button_text_normal; } .LESSbutton_up_style{ - background: @color_button_normal; - background: @color_button_normal_webkit; - background: @color_button_normal_moz; - background: @color_button_normal_o; - background: @color_button_normal_ms; + background: @color_button_normal; + background: @color_button_normal_webkit; + background: @color_button_normal_moz; + background: @color_button_normal_o; + background: @color_button_normal_ms; + border: 1px @button_border_color solid; } .LESSbutton_box_style{ @@ -164,7 +167,7 @@ background: @color_button_normal_o; background: @color_button_normal_ms; border: 1px solid; - border-color: rgba(220, 218, 211, 1); + border-color: @button_border_color; .LESSbox-shadow-line( @button_shadow_outer ); } .LESSbutton_inner_box_style{ @@ -176,24 +179,24 @@ .LESSbox-shadow-line( @button_shadow_inner ); } .LESSbutton_inner_pressstyle{ - color: @color_button_text_press; + color: @color_button_text_press; } .LESSbutton_text1_style{ - font-family: @font_family; - font-weight: normal; - font-size: 1.0rem; - font-style:normal; - color: @color_button_text_normal; + font-family: @font_family; + font-weight: normal; + font-size: 1.0rem; + font-style:normal; + color: @color_button_text_normal; } .LESSbutton_hover_style{ - color: @color_button_text_normal; + color: @color_button_text_normal; } .LESSbutton_down_style{ - background: @color_button_press; - color: @color_button_text_press; + background: @color_button_press; + color: @color_button_text_press; } .LESSbutton_edit_style{ -- 2.7.4