From 8f612683bbcec90ffe56a3bd6ceeca476aa8c1de Mon Sep 17 00:00:00 2001 From: "ji.ji" Date: Mon, 29 Apr 2013 11:18:50 +0900 Subject: [PATCH] [TizenWinset]update TizenWinset(tizen_2.1) Change-Id: I9376dd16da6491b1940e575a25f3421993772eda --- widgets/checkbox/checkbox.html | 8 ++++---- widgets/checkbox/styles.css | 5 +++++ widgets/ctxpopup.html | 2 -- widgets/grid/namecard.css | 9 +++------ widgets/naviframe/naviframe_footer_more.html | 2 -- widgets/naviframe/naviframe_footer_more_button.html | 1 - widgets/popupwindow/popupwindow.js | 7 +++++++ widgets/tabbar/tabbar_footer_more.html | 15 ++++++--------- widgets/tabbar/tabbar_footer_segment_more.html | 17 +++++++---------- 9 files changed, 32 insertions(+), 34 deletions(-) diff --git a/widgets/checkbox/checkbox.html b/widgets/checkbox/checkbox.html index b32c10d..1c2a8e2 100644 --- a/widgets/checkbox/checkbox.html +++ b/widgets/checkbox/checkbox.html @@ -25,7 +25,7 @@
-

First checkbox check value : +

First checkbox check value :
(click the button! ) @@ -37,19 +37,19 @@


-
+
- +
- +
diff --git a/widgets/checkbox/styles.css b/widgets/checkbox/styles.css index e577ed2..b38fdba 100644 --- a/widgets/checkbox/styles.css +++ b/widgets/checkbox/styles.css @@ -3,4 +3,9 @@ } .my-check-inline-style { display: inline; +} + +.my-check-controlgroup div.ui-checkbox { + margin-top : 3px; + margin-bottom : 3px; } \ No newline at end of file diff --git a/widgets/ctxpopup.html b/widgets/ctxpopup.html index 93a79e4..dc41eb2 100644 --- a/widgets/ctxpopup.html +++ b/widgets/ctxpopup.html @@ -165,8 +165,6 @@
  • Add to contact
  • Call log
  • Music
  • -
  • File manager
  • -
  • Internal Link
  • diff --git a/widgets/grid/namecard.css b/widgets/grid/namecard.css index f8a3b0d..e8f7be7 100644 --- a/widgets/grid/namecard.css +++ b/widgets/grid/namecard.css @@ -35,7 +35,6 @@ } .ui-demo-namecard-contents span { - font-style : italic; color : #666; border-bottom : 1px dashed; margin-top: 0rem; @@ -57,8 +56,7 @@ .ui-demo-namecard-span-x { color : gray; - font : normal 0.6rem Georgia, serif !important; - + font-size : 0.6rem; width: 5rem; display: block; white-space : nowrap; @@ -70,7 +68,7 @@ .ui-demo-namecard-contents span.name { color : gray; - font : normal 0.6rem Georgia, serif !important; + font-size : 0.6rem; width: 4rem; display: inline-block; white-space : nowrap; @@ -109,9 +107,8 @@ .ui-demo-namecard-list-contents span{ left : 9.6rem; font-weight : normal; - font-size : 0.9rem; + font-size : 0.8rem; color : gray; padding-top : 1rem; - font-family: Helvetica, Arial, sans-serif; margin-top: 0rem; } diff --git a/widgets/naviframe/naviframe_footer_more.html b/widgets/naviframe/naviframe_footer_more.html index fb60016..b074648 100644 --- a/widgets/naviframe/naviframe_footer_more.html +++ b/widgets/naviframe/naviframe_footer_more.html @@ -34,8 +34,6 @@
  • Add to contact
  • Call log
  • Music
  • -
  • File manager
  • -
  • Internal Link
  • diff --git a/widgets/naviframe/naviframe_footer_more_button.html b/widgets/naviframe/naviframe_footer_more_button.html index 1a4c8ea..01a63ac 100644 --- a/widgets/naviframe/naviframe_footer_more_button.html +++ b/widgets/naviframe/naviframe_footer_more_button.html @@ -37,7 +37,6 @@
  • Add to contact
  • Call log
  • Music
  • -
  • File manager
  • diff --git a/widgets/popupwindow/popupwindow.js b/widgets/popupwindow/popupwindow.js index 16f93dd..f62f272 100644 --- a/widgets/popupwindow/popupwindow.js +++ b/widgets/popupwindow/popupwindow.js @@ -4,6 +4,13 @@ $( document ).one( "pageinit", "#popupwindow-demo", function () { $("#textbox_popup").popup("close"); return false; }); + + if ( $.tizen.__tizen__.util.isMobileBrowser() ) { + var direction = window.screen.orientation; + if ( direction === "landscape-primary" || direction === "landscape-secondary" ) { + $( "#go_textbox_popup a" ).attr( "href", "#textbox_popup_landscape" ); + } + } }); function onSuccessPopupCallback ( ori ) { diff --git a/widgets/tabbar/tabbar_footer_more.html b/widgets/tabbar/tabbar_footer_more.html index 69fb63b..deba94c 100644 --- a/widgets/tabbar/tabbar_footer_more.html +++ b/widgets/tabbar/tabbar_footer_more.html @@ -27,16 +27,14 @@
    - + - diff --git a/widgets/tabbar/tabbar_footer_segment_more.html b/widgets/tabbar/tabbar_footer_segment_more.html index 34be34d..30d4b8e 100644 --- a/widgets/tabbar/tabbar_footer_segment_more.html +++ b/widgets/tabbar/tabbar_footer_segment_more.html @@ -26,18 +26,15 @@
    - + -