From: Jinhyuk Jun Date: Thu, 20 Dec 2012 01:55:39 +0000 (+0900) Subject: segment control backward compatiblity X-Git-Tag: accepted/tizen_2.1/20130425.023924~7^2~336 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c2b16fa423c213f564f0aa9277ddd6d33bad61c;p=framework%2Fweb%2Fweb-ui-fw.git segment control backward compatiblity Change-Id: I92126b488e38465cbab7f09a72d2b7628f225beb --- diff --git a/src/themes/tizen/common/jquery.mobile.controlgroup.less b/src/themes/tizen/common/jquery.mobile.controlgroup.less index 9fcd8c5..17d6bc6 100755 --- a/src/themes/tizen/common/jquery.mobile.controlgroup.less +++ b/src/themes/tizen/common/jquery.mobile.controlgroup.less @@ -47,6 +47,14 @@ fieldset.ui-controlgroup { border-left-color: @color_controlgroup_btn_border; border-left-style: solid; } + .ui-radio-on { + .ui-btn-inner { + background : @color_bg; + .ui-btn-text { + color : @color_bar_title_text; + } + } + } .ui-corner-left { border-left-width: 0px; } @@ -79,7 +87,8 @@ fieldset.ui-controlgroup { padding: 0; .ui-btn { display: inline-block; - margin: 0 -5px 0 0; + margin-left : -4 * @unit_base; + margin-right : -3 * @unit_base; } .ui-checkbox, .ui-radio { float: left; @@ -95,7 +104,6 @@ fieldset.ui-controlgroup { border-radius : 0px; box-shadow : none; background : none; - margin-left : -10 * @unit_base; &.ui-btn-down-s, .ui-btn-active-s { .ui-btn-inner { background : @color_bg; @@ -105,11 +113,27 @@ fieldset.ui-controlgroup { } } + &.ui-btn-down-s { + .ui-btn-inner { + background : @color_tabbar_btn_tab_press; + } + } + >.ui-btn-inner { border : 0px solid; box-shadow : none; padding-top : 5 * @unit_base; padding-bottom : 5 * @unit_base; + padding-left : 10 * @unit_base; + padding-right : 10 * @unit_base; + } + } + + label { + > span.ui-btn-inner { + padding-top : 3 * @unit_base; + padding-bottom : 3 * @unit_base; } } + } diff --git a/src/themes/tizen/common/jquery.mobile.segmentctrl.less b/src/themes/tizen/common/jquery.mobile.segmentctrl.less index a58442d..e16908f 100755 --- a/src/themes/tizen/common/jquery.mobile.segmentctrl.less +++ b/src/themes/tizen/common/jquery.mobile.segmentctrl.less @@ -42,3 +42,6 @@ border-radius: .3em ; color: @color_segmentcontrol_Seg_text; } +.ui-controlgroup .ui-radio .ui-btn-down-s .ui-btn-inner { + background : @color_tabbar_btn_tab_press; +} \ No newline at end of file diff --git a/src/themes/tizen/common/jquery.mobile.theme.less b/src/themes/tizen/common/jquery.mobile.theme.less index d9c79ad..8699c0b 100755 --- a/src/themes/tizen/common/jquery.mobile.theme.less +++ b/src/themes/tizen/common/jquery.mobile.theme.less @@ -220,8 +220,8 @@ box-shadow : none; padding : 0px; - margin-left : -10 * @unit_base; - margin-right : 1px; + margin-left : -4 * @unit_base; + margin-right : -5 * @unit_base; &.ui-btn-down-s, .ui-btn-active-s { .ui-btn-inner { diff --git a/src/themes/tizen/tizen-white/style.less b/src/themes/tizen/tizen-white/style.less index d0c4870..9bd6968 100755 --- a/src/themes/tizen/tizen-white/style.less +++ b/src/themes/tizen/tizen-white/style.less @@ -264,7 +264,7 @@ /*************************************************************************** ControlGroup ***************************************************************************/ -@color_controlgroup_btn_border : rgba(26, 82, 116, 1); /* #252525 */ +@color_controlgroup_btn_border : rgba(192, 192, 192, 1); /* 00_divider_line.9.png */ /***************************************************************************