Merge branch 'master' into tizen_2.2

Change-Id: Ib62ba73dd436753f6a1ba6139d16642bdcacc6c2

4 files changed, 35 insertions, 13 deletions

diff --git a/packaging/web-ui-fw.changes b/packaging/web-ui-fw.changes
index 28228231..913d9684 100644
--- a/packaging/web-ui-fw.changes
+++ b/packaging/web-ui-fw.changes
@@ -1,3 +1,7 @@
+* Fri Oct 18 2013 Hyeoncheol Choi <hc7.choi@samsung.com> 0.2.65
+        - listview: remove radius at inset mode (P131016-02897)
+        - Checkbox : modify to checkbox and text position css property (P131017-02872)
+
 * Wed Oct 16 2013 Heeju Joo <heeju.joo@samsung.com> 0.2.64
         - TizenWinset : add condition popup appear of textbox popup (N_SE-51783)
         - Globalize: Add AM/PM switcher in hindi language (N_SE-52707)
diff --git a/packaging/web-ui-fw.spec b/packaging/web-ui-fw.spec
index 47d85c4c..02dd9dd2 100644
--- a/packaging/web-ui-fw.spec
+++ b/packaging/web-ui-fw.spec
@@ -1,5 +1,5 @@
 Name:       web-ui-fw
-Version:    0.2.64
+Version:    0.2.65
 Release:    0
 Summary:    Tizen Web UI Framework Library
 Group:      Development/Other
@@ -98,6 +98,10 @@ Summary:    Tizen Web UI Framework Demo Application: tizen winset demo
 
 ###############################
 %changelog
+* Fri Oct 18 2013 Hyeoncheol Choi <hc7.choi@samsung.com> 0.2.65
+	- listview: remove radius at inset mode (P131016-02897)
+	- Checkbox : modify to checkbox and text position css property (P131017-02872)
+
 * Wed Oct 16 2013 Heeju Joo <heeju.joo@samsung.com> 0.2.64
 	- TizenWinset : add condition popup appear of textbox popup (N_SE-51783)
 	- Globalize: Add AM/PM switcher in hindi language (N_SE-52707)
diff --git a/src/themes/tizen/common/jquery.mobile.forms.checkboxradio.less b/src/themes/tizen/common/jquery.mobile.forms.checkboxradio.less
index 4b36dbbb..f6e81fdb 100644
--- a/src/themes/tizen/common/jquery.mobile.forms.checkboxradio.less
+++ b/src/themes/tizen/common/jquery.mobile.forms.checkboxradio.less
@@ -23,7 +23,7 @@
 @checkbox-radio-icon-internal-bottom: (-@checkbox-radio-size-height/2); //-icon size/2
 @favorite-icon-internal-bottom: (-@favorite-size-height/2); //-icon size/2
 
-@icon-left-margin: (8*@unit_base);
+@icon-left-margin: (24*@unit_base);
 @checkbox-radio-label-left: (@checkbox-radio-size-width/2 + @icon-left-margin);
 @favorite-label-left: (@favorite-size-width/2 + @icon-left-margin);
 
@@ -52,20 +52,23 @@
 	}
 	.ui-btn.ui-btn-icon-left {
 		.ui-btn-inner {
-			min-width: 10*@unit_base; // TODO: check this after layout done.
+			min-width: @checkbox-radio-size-width; // TODO: check this after layout done.
 			min-height: @checkbox-radio-all-height;
 			line-height: @checkbox-radio-all-height;
-			padding: 0 16*@unit_base 0 16*@unit_base;
+			margin: 0 8*@unit_base 0 5*@unit_base;
+			padding : 0;
 			.ui-btn-text {
 				vertical-align: middle;
 				min-height: @checkbox-radio-size-height;
 			}
 			/* TODO : after button fixed, recheck! */
 			.ui-btn-text.ui-btn-text-padding-left {
-				padding-left: @checkbox-radio-label-left; //for test
+				margin-left: @checkbox-radio-label-left; //for test
+				padding-left : 0;
 			}
 			.ui-icon {
 				position: absolute;
+				left: 0;
 				top: 50%;
 				width: @checkbox-radio-size-width;
 				height: @checkbox-radio-size-height;
@@ -86,18 +89,17 @@
 		.ui-btn-inner {
 			display: inline-block;
 			line-height: @checkbox-radio-all-height;
-			padding: 0 0 0 16*@unit_base;
+			margin: 0 0 0 5*@unit_base;
+			padding : 0;
 			.ui-btn-text {
 				display: inline-block;
 				vertical-align: middle;
 				//margin-left: @favorite-label-left;
 			}
 			/* TODO : after button fixed, recheck! */
-			.ui-btn-text.ui-btn-text-padding-left {
-				padding-left: @favorite-label-left;
-			}
 			.ui-icon {
 				position: absolute;
+				left: 0;
 				top: 50%;
 				width: @favorite-size-width;
 				height: @favorite-size-height;
@@ -106,7 +108,6 @@
 		}
 	}
 }
-
 /* put img inside of checkbox(normal, favorite style) */
 
 .ui-icon-checkbox-off, .ui-icon-checkbox-on,
diff --git a/src/themes/tizen/common/jquery.mobile.listview.less b/src/themes/tizen/common/jquery.mobile.listview.less
index 6129ae55..ce599981 100644
--- a/src/themes/tizen/common/jquery.mobile.listview.less
+++ b/src/themes/tizen/common/jquery.mobile.listview.less
@@ -238,9 +238,6 @@
 
 				color : transparent;
 
-				.ui-icon {
-					left : 5 * @unit_base;
-				}
 			}
 
 			label.ui-btn-icon_only {
@@ -1031,3 +1028,19 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub {
 	-webkit-transition-timing-function:	linear;
 	-moz-transition-timing-function:	linear;
 }
+.ui-listview-inset .ui-corner-top {
+  -moz-border-radius-topleft: 0em;
+  -webkit-border-top-left-radius: 0em;
+  border-top-left-radius: 0em;
+  -moz-border-radius-topright: 0em;
+  -webkit-border-top-right-radius: 0em;
+  border-top-right-radius: 0em;
+}
+.ui-listview-inset .ui-corner-bottom {
+  -moz-border-radius-bottomleft: 0em;
+  -webkit-border-bottom-left-radius: 0em;
+  border-bottom-left-radius: 0em;
+  -moz-border-radius-bottomright: 0em;
+  -webkit-border-bottom-right-radius: 0em;
+  border-bottom-right-radius: 0em;
+}