From: hjnim.kim Date: Fri, 3 May 2013 06:37:08 +0000 (+0900) Subject: Merge branch 'master' into tizen_2.1 X-Git-Tag: accepted/tizen/20130520.101609~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b130075145ac73102400480f2527bb4dbb946f6d;hp=4c37f17ee38631356bc9881eb208a8bde9fb1b99;p=platform%2Fframework%2Fweb%2Fweb-ui-fw.git Merge branch 'master' into tizen_2.1 Change-Id: Ib39c2e5103d8e61bc6251d9987863a7a12720676 --- diff --git a/COPYING b/COPYING index 68ee13d..cb29a5f 100644 --- a/COPYING +++ b/COPYING @@ -33,7 +33,7 @@ The following files are licensed under Flora license. **************************************************************************** Flora License -Version 1.0, April, 2013 +Version 1.1, April, 2013 http://floralicense.org/license/ @@ -225,7 +225,7 @@ identification within third-party archives. Copyright [yyyy] [name of copyright owner] - Licensed under the Flora License, Version 1.0 (the "License"); + Licensed under the Flora License, Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/demos/tizen-winsets/widgets/grid/namecard.css b/demos/tizen-winsets/widgets/grid/namecard.css index e8f7be7..d417eca 100644 --- a/demos/tizen-winsets/widgets/grid/namecard.css +++ b/demos/tizen-winsets/widgets/grid/namecard.css @@ -57,6 +57,7 @@ .ui-demo-namecard-span-x { color : gray; font-size : 0.6rem; + text-align: center; width: 5rem; display: block; white-space : nowrap; @@ -69,6 +70,7 @@ .ui-demo-namecard-contents span.name { color : gray; font-size : 0.6rem; + text-align: center; width: 4rem; display: inline-block; white-space : nowrap; diff --git a/demos/tizen-winsets/widgets/popupwindow/popupwindow.js b/demos/tizen-winsets/widgets/popupwindow/popupwindow.js index f62f272..f505747 100644 --- a/demos/tizen-winsets/widgets/popupwindow/popupwindow.js +++ b/demos/tizen-winsets/widgets/popupwindow/popupwindow.js @@ -15,14 +15,17 @@ $( document ).one( "pageinit", "#popupwindow-demo", function () { function onSuccessPopupCallback ( ori ) { if ( ori.status === "PORTRAIT_PRIMARY" || ori.status === "PORTRAIT_SECONDARY" ) { - $("#textbox_popup_landscape").popup("close"); - $("#go_textbox_popup a").attr("href", "#textbox_popup"); + if( $( "#textbox_popup_landscape" ).parents( ".ui-popup-container" ).is( ".ui-popup-active" ) ) { + $( "#textbox_popup_landscape" ).popup( "close" ); + } + $( "#go_textbox_popup a" ).attr( "href", "#textbox_popup" ); } else if ( ori.status === "LANDSCAPE_PRIMARY" || ori.status === "LANDSCAPE_SECONDARY" ) { - $("#textbox_popup").popup("close"); - $("#go_textbox_popup a").attr("href", "#textbox_popup_landscape"); + if( $( "#textbox_popup" ).parents( ".ui-popup-container" ).is( ".ui-popup-active" ) ) { + $( "#textbox_popup" ).popup( "close" ); + } + $( "#go_textbox_popup a" ).attr( "href", "#textbox_popup_landscape" ); } - } function onErrorPopupCallback ( error ) { diff --git a/demos/tizen-winsets/widgets/splitview.html b/demos/tizen-winsets/widgets/splitview.html index b1e763c..a1bbdef 100644 --- a/demos/tizen-winsets/widgets/splitview.html +++ b/demos/tizen-winsets/widgets/splitview.html @@ -8,11 +8,11 @@ @@ -26,6 +26,11 @@ + +
+
+
+
@@ -46,15 +51,15 @@ $( "#testGetRatio" ).bind( "vclick", function () { var ratio = testSplitview.splitview( "option", "ratio" ); - window.alert( "Up : Down = \n" + ratio[ 0 ].toFixed( 2 ) + " : " + ratio[ 1 ].toFixed( 2 ) ); + $( ".splitview-popup" ).text( "Up : Down = \n" + ratio[ 0 ].toFixed( 2 ) + " : " + ratio[ 1 ].toFixed( 2 ) ); }); - $( "#testSetConents" ).bind( "vclick", function () { + $( "#testSetContents" ).bind( "vclick", function () { var element = $( "

Changed \"Up\" pane

Contents changed!!
" ); testSplitview.splitview( "pane", "#up", element ); }); - $( "#testGetConents" ).bind( "vclick", function () { + $( "#testGetContents" ).bind( "vclick", function () { var contents = "", upContents = testSplitview.splitview( "pane", "#up" ), downContents = testSplitview.splitview( "pane", "#down" ); @@ -65,7 +70,7 @@ ( ( typeof downContents === "undefined" || !downContents ) ? "" : downContents[ 0 ].outerHTML ); contents = contents.substring(0, 120) + "..." ; - window.alert( contents ); + $( ".splitview-popup" ).text( contents ); }); diff --git a/demos/tizen-winsets/widgets/tabbar/tabbar.css b/demos/tizen-winsets/widgets/tabbar/tabbar.css index 10b092b..012a9d6 100644 --- a/demos/tizen-winsets/widgets/tabbar/tabbar.css +++ b/demos/tizen-winsets/widgets/tabbar/tabbar.css @@ -1,9 +1,7 @@ -.ui-btn-up-s .ui-icon-tabedit { +.ui-icon-tabedit { background-image: url(00_tab_edit.png); } -.ui-btn-hover-s .ui-icon-tabedit, -.ui-btn-active.ui-btn-up-s .ui-icon-tabedit, -.ui-btn-down-s .ui-icon-tabedit { +.ui-btn-active .ui-icon-tabedit { background-image: url(00_tab_edit_press.png); } diff --git a/demos/tizen-winsets/widgets/tokentextarea/tokentextarea-demo.js b/demos/tizen-winsets/widgets/tokentextarea/tokentextarea-demo.js index 4f5e994..52720f1 100644 --- a/demos/tizen-winsets/widgets/tokentextarea/tokentextarea-demo.js +++ b/demos/tizen-winsets/widgets/tokentextarea/tokentextarea-demo.js @@ -14,7 +14,7 @@ $( "#MBTgetInputTextTest" ).on( "click", function () { var input = $( ":jqmData(role='tokentextarea')" ).tokentextarea( "inputText" ); - window.alert( "input String : " + input ); + $( ".tta-popup .ui-popup-text" ).text( "Input string : " + input ); }); $( "#MBTremoveAllItemTest" ).on( "click", function () { @@ -24,7 +24,7 @@ $( "#MBTgetSelectedItemTest" ).on( "click", function () { var content = $( ":jqmData(role='tokentextarea')" ).tokentextarea( "select" ); - window.alert( "Select content : " + content ); + $( ".tta-popup .ui-popup-text" ).text( "Select content : " + content ); }); $( "#MBTselectItemTest" ).on( "click", function () { @@ -33,7 +33,7 @@ $( "#MBTlengthTest" ).on( "click", function () { var length = $( ":jqmData(role='tokentextarea')" ).tokentextarea( "length" ); - window.alert( "length : " + length ); + $( ".tta-popup .ui-popup-text" ).text( "Length : " + length ); }); $( "#MBTfocusInTest" ).on( "click", function () { diff --git a/demos/tizen-winsets/widgets/tokentextarea/tokentextarea.html b/demos/tizen-winsets/widgets/tokentextarea/tokentextarea.html index 39cc1b9..492c1d8 100644 --- a/demos/tizen-winsets/widgets/tokentextarea/tokentextarea.html +++ b/demos/tizen-winsets/widgets/tokentextarea/tokentextarea.html @@ -29,14 +29,22 @@
  • Append Item
  • Remove first Item
  • Input 'Hello'
    • -
  • Get input text
    • +
  • Get input text
  • Select 1
    • -
  • Selected item
    • -
  • Length
    • +
  • Selected item
    • +
  • Length
  • Grouping On
  • Grouping Off
  • Remove All Item
    • + +
    +
    +
    +
    + OK +
    +
    diff --git a/libs/patch/0021-JQM-add-tizen-toggle-switch.patch b/libs/patch/0021-JQM-add-tizen-toggle-switch.patch index eb597c5..3a3bb4c 100644 --- a/libs/patch/0021-JQM-add-tizen-toggle-switch.patch +++ b/libs/patch/0021-JQM-add-tizen-toggle-switch.patch @@ -60,7 +60,7 @@ index e7f5df0..2e682db 100644 - }); + if ( imgToggle ) { + appHandle = $( this.handle ).parents( ".ui-slider" ); -+ if ( $( this.handle ).attr("aria-valuenow") === "on" ) { ++ if ( $( this.handle ).attr("aria-valuenow") === "on" || $( this.handle ).attr("aria-valuenow") === $( this.element ).children( "option:last" ).attr( "value" ) ) { + appHandle.children( "span.ui-slider-label-a" ).show(); + appHandle.children( "span.ui-slider-label-b" ).hide(); + } else { diff --git a/packaging/web-ui-fw.spec b/packaging/web-ui-fw.spec index dad719a..54b2164 100644 --- a/packaging/web-ui-fw.spec +++ b/packaging/web-ui-fw.spec @@ -1,5 +1,5 @@ Name: web-ui-fw -Version: 0.2.26 +Version: 0.2.27 Release: 0 Summary: Tizen Web UI Framework Library Group: Development/Other @@ -97,6 +97,27 @@ Summary: Tizen Web UI Framework Demo Application: tizen winset demo ############################### %changelog +* Fri May 03 2013 Hyunjung kim 0.2.27 + - Splitview: Fix popup error + - Tests: Add slider tests checking if jqm slider is used for select elements + - Adjust the latest GUI + - Handler: Adjust the latest GUI + - Swipe: Adjust the latest GUI + - Fastscroll: Adjust the latest GUI + - ToggleSwitch : bug fix + - TizenWinset : bug fix(N_SE-36666) + - Gallery3d: Fix Gallery3d TC failure + - UnitTC: fix virtualgrid test error + - Popup: popup background image have been added + - Tokentextarea: Use jQM popup instead of window.alert(). + - Splitview: Use jQM popup instead of window.alert(). + - Splitview: Change an option name to start with a capital letter + - License: Change flora license version + - Tabbar: Adjust the latest GUI + - Tokentextarea: Change from 'px' to 'em.' + - Fastscroll: Add 'orientationchange' event handler. + - Gallery3d: Fix null reference error + * Fri Apr 26 2013 Youmin Ha 0.2.26 - PageLayout : bug fix - Gallery3d: Change timing of 'gl-matrix' library's execution diff --git a/src/js/jquery.mobile.tizen.pinch.js b/src/js/jquery.mobile.tizen.pinch.js index 137bc78..cefca7a 100644 --- a/src/js/jquery.mobile.tizen.pinch.js +++ b/src/js/jquery.mobile.tizen.pinch.js @@ -9,7 +9,7 @@ define( [ 'jquery.mobile.core' ], function ( ) { /* *************************************************************************** Flora License - Version 1.0, April, 2013 + Version 1.1, April, 2013 http://floralicense.org/license/ @@ -201,7 +201,7 @@ define( [ 'jquery.mobile.core' ], function ( ) { Copyright [yyyy] [name of copyright owner] - Licensed under the Flora License, Version 1.0 (the "License"); + Licensed under the Flora License, Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/src/js/widgets/jquery.mobile.tizen.fastscroll.js b/src/js/widgets/jquery.mobile.tizen.fastscroll.js index a9f9d53..6b28fce 100644 --- a/src/js/widgets/jquery.mobile.tizen.fastscroll.js +++ b/src/js/widgets/jquery.mobile.tizen.fastscroll.js @@ -115,7 +115,7 @@ define( [ '../jquery.mobile.tizen.scrollview' ], function ( ) { page = $el.closest( ':jqmData(role="page")' ), jumpToDivider; - this.scrollview = $el.closest( '.ui-scrollview-clip' ); + this.scrollview = $el.addClass( 'ui-fastscroll-target' ).closest( '.ui-scrollview-clip' ); this.shortcutsContainer = $( '
    ' ); this.shortcutsList = $( '' ); @@ -183,7 +183,6 @@ define( [ '../jquery.mobile.tizen.scrollview' ], function ( ) { var listItem = $( this ); $( listItem ) .removeClass( "ui-fastscroll-hover" ) - .removeClass( "ui-fastscroll-hover-up" ) .removeClass( "ui-fastscroll-hover-down" ); }); // Hit test each list item @@ -228,7 +227,6 @@ define( [ '../jquery.mobile.tizen.scrollview' ], function ( ) { $popup.hide(); $( ".ui-fastscroll-hover" ).removeClass( "ui-fastscroll-hover" ); $( ".ui-fastscroll-hover-first-item" ).removeClass( "ui-fastscroll-hover-first-item" ); - $( ".ui-fastscroll-hover-up" ).removeClass( "ui-fastscroll-hover-up" ); $( ".ui-fastscroll-hover-down" ).removeClass( "ui-fastscroll-hover-down" ); self._setTimer( true ); } ); @@ -244,10 +242,6 @@ define( [ '../jquery.mobile.tizen.scrollview' ], function ( ) { self.refresh(); } ); - $( window ).unbind( ".fastscroll" ).bind( "resize.fastscroll", function ( e ) { - self.refresh(); - } ); - self.scrollview.bind( "scrollstart", function ( e ) { self._setTimer( false ); }).bind( "scrollstop", function ( e ) { @@ -265,8 +259,8 @@ define( [ '../jquery.mobile.tizen.scrollview' ], function ( ) { } $popup.text( text ) - .css( { marginLeft: -( $popup.width() / 2 ), - marginTop: -( $popup.height() / 2 ), + .css( { marginLeft: -( $popup.outerWidth() / 2 ), + marginTop: -( $popup.outerHeight() / 2 ), padding: $popup.css( "paddingTop" ) } ) .width( $popup.height() ) .show(); @@ -275,9 +269,6 @@ define( [ '../jquery.mobile.tizen.scrollview' ], function ( ) { if ( listItem.index() === 0 ) { $( listItem ).addClass( "ui-fastscroll-hover-first-item" ); } - if ( listItem.index() > 0 ) { - $( listItem ).siblings().eq( listItem.index() - 1 ).addClass( "ui-fastscroll-hover-up" ); - } $( listItem ).siblings().eq( listItem.index() ).addClass( "ui-fastscroll-hover-down" ); }, @@ -298,8 +289,8 @@ define( [ '../jquery.mobile.tizen.scrollview' ], function ( ) { } $popup.text( text ) - .css( { marginLeft: -( $popup.width() / 2 ), - marginTop: -( $popup.height() / 2 ), + .css( { marginLeft: -( $popup.outerWidth() / 2 ), + marginTop: -( $popup.outerHeight() / 2 ), padding: $popup.css( "paddingTop" ) } ) .width( $popup.height() ) .show(); @@ -308,9 +299,6 @@ define( [ '../jquery.mobile.tizen.scrollview' ], function ( ) { if ( listItem.index() === 0 ) { $( listItem ).addClass( "ui-fastscroll-hover-first-item" ); } - if ( listItem.index() > 0 ) { - $( listItem ).siblings().eq( listItem.index() - 1 ).addClass( "ui-fastscroll-hover-up" ); - } $( listItem ).siblings().eq( listItem.index() ).addClass( "ui-fastscroll-hover-down" ); }, @@ -327,7 +315,6 @@ define( [ '../jquery.mobile.tizen.scrollview' ], function ( ) { $popup.hide(); $( ".ui-fastscroll-hover" ).removeClass( "ui-fastscroll-hover" ); $( ".ui-fastscroll-hover-first-item" ).removeClass( "ui-fastscroll-hover-first-item" ); - $( ".ui-fastscroll-hover-up" ).removeClass( "ui-fastscroll-hover-up" ); $( ".ui-fastscroll-hover-down" ).removeClass( "ui-fastscroll-hover-down" ); self._setTimer( true ); }); @@ -659,6 +646,9 @@ define( [ '../jquery.mobile.tizen.scrollview' ], function ( ) { .fastscroll(); } ); + $( window ).bind( "resize orientationchange", function ( e ) { + $( ".ui-page-active .ui-fastscroll-target" ).fastscroll( "refresh" ); + } ); } ( jQuery ) ); //>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); diff --git a/src/js/widgets/jquery.mobile.tizen.gallery3d.js b/src/js/widgets/jquery.mobile.tizen.gallery3d.js index 832c69e..8b894b6 100644 --- a/src/js/widgets/jquery.mobile.tizen.gallery3d.js +++ b/src/js/widgets/jquery.mobile.tizen.gallery3d.js @@ -10,7 +10,7 @@ define( [ "components/imageloader", "components/motionpath", "components/webgl" /* *************************************************************************** Flora License - Version 1.0, April, 2013 + Version 1.1, April, 2013 http://floralicense.org/license/ @@ -202,7 +202,7 @@ define( [ "components/imageloader", "components/motionpath", "components/webgl" Copyright [yyyy] [name of copyright owner] - Licensed under the Flora License, Version 1.0 (the "License"); + Licensed under the Flora License, Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -714,6 +714,8 @@ define( [ "components/imageloader", "components/motionpath", "components/webgl" return; } + self._stop(); + canvas = canvas || self._canvas; $( self._nodes ).each( function ( i ) { diff --git a/src/js/widgets/jquery.mobile.tizen.scrollview.handler.js b/src/js/widgets/jquery.mobile.tizen.scrollview.handler.js index b2b1352..67eafe3 100644 --- a/src/js/widgets/jquery.mobile.tizen.scrollview.handler.js +++ b/src/js/widgets/jquery.mobile.tizen.scrollview.handler.js @@ -98,7 +98,7 @@ define( [ '../jquery.mobile.tizen.core', '../jquery.mobile.tizen.scrollview' ], createHandler = function ( target ) { var $view = target, prefix = "
    ", + suffix = "\">
    ", scrollview = $view.data( "scrollview" ), options = scrollview.options, direction = options.direction, @@ -109,7 +109,7 @@ define( [ '../jquery.mobile.tizen.core', '../jquery.mobile.tizen.scrollview' ], _$clip = scrollview._$clip, scrollbar = $view.find( ".ui-scrollbar" ), handler = null, - handlerThumb = null, + handlerHandle = null, viewLength = 0, clipLength = 0, handlerHeight = 0, @@ -128,7 +128,7 @@ define( [ '../jquery.mobile.tizen.core', '../jquery.mobile.tizen.scrollview' ], }, setHanderPostion = function ( scrollPos ) { var handlerPos = Math.round( ( isHorizontal ? scrollPos.x : scrollPos.y ) / viewLength * trackLength ); - handlerThumb[0].style[ ( isHorizontal ? "left" : "top" ) ] = handlerPos + "px"; + handlerHandle[0].style[ ( isHorizontal ? "left" : "top" ) ] = handlerPos + "px"; }, stopHandlerScroll = function () { $( document ).unbind( ".handler" ); @@ -136,16 +136,16 @@ define( [ '../jquery.mobile.tizen.core', '../jquery.mobile.tizen.scrollview' ], _$view.trigger( "scrollstop" ); }; - if ( $view.find( ".ui-handler-thumb" ).length !== 0 || typeof direction !== "string" ) { + if ( $view.find( ".ui-handler-handle" ).length !== 0 || typeof direction !== "string" ) { return; } handler = $( [ prefix, direction, suffix ].join( "" ) ).appendTo( $view.addClass( " ui-handler-" + theme ) ); - handlerThumb = $view.find( ".ui-handler-thumb" ).attr( { + handlerHandle = $view.find( ".ui-handler-handle" ).attr( { "tabindex" : "0", "aria-label" : ( isHorizontal ? "Horizontal handler, double tap and move to scroll" : "Verticalhandler, double tap and move to scroll" ) }).hide(); - handlerHeight = ( isHorizontal ? handlerThumb.width() : handlerThumb.height() ); + handlerHeight = ( isHorizontal ? handlerHandle.width() : handlerHandle.height() ); handlerMargin = ( isHorizontal ? parseInt( handler.css( "right" ), 10 ) : parseInt( handler.css( "bottom" ), 10 ) ); $.extend( $view, { @@ -153,8 +153,8 @@ define( [ '../jquery.mobile.tizen.core', '../jquery.mobile.tizen.scrollview' ], }); // handler drag - handlerThumb.bind( dragStartEvt, { - e : handlerThumb[0] + handlerHandle.bind( dragStartEvt, { + e : handlerHandle[0] }, function ( event ) { scrollview._stopMScroll(); @@ -238,7 +238,7 @@ define( [ '../jquery.mobile.tizen.core', '../jquery.mobile.tizen.scrollview' ], } handler.addClass( "ui-handler-visible" ); - handlerThumb.stop( true, true ) + handlerHandle.stop( true, true ) .fadeIn(); }).bind( "scrollupdate", function ( event, data ) { if ( !scrollview.enableHandler() || viewLength < 0 || clipLength < handlerHeight ) { @@ -265,7 +265,7 @@ define( [ '../jquery.mobile.tizen.core', '../jquery.mobile.tizen.scrollview' ], } scrollview._handlerTimer = setTimeout( function () { if ( scrollview._timerID === 0 && $view.moveData === null ) { - handlerThumb.stop( true, true ) + handlerHandle.stop( true, true ) .css( "opacity", 1.0 ) .fadeOut( function () { handler.removeClass( "ui-handler-visible" ); diff --git a/src/themes/tizen/common/jquery.mobile.button.less b/src/themes/tizen/common/jquery.mobile.button.less index 4f60202..afee64c 100644 --- a/src/themes/tizen/common/jquery.mobile.button.less +++ b/src/themes/tizen/common/jquery.mobile.button.less @@ -124,8 +124,8 @@ .ui-btn.ui-btn-edit .ui-icon { width: @width_buttonEdit; height: @height_buttonEdit; } /* Padding for Icon with text */ -.ui-btn .ui-btn-text.ui-btn-text-padding-left { padding-left: 44 * @unit_base; } -.ui-btn .ui-btn-text.ui-btn-text-padding-right { padding-right: 48 * @unit_base; } +.ui-btn .ui-btn-text.ui-btn-text-padding-left { padding-left: 20 * @unit_base; } +.ui-btn .ui-btn-text.ui-btn-text-padding-right { padding-right: 32 * @unit_base; } .ui-btn .ui-btn-text.ui-btn-text-padding-top {padding-top: 32 * @unit_base;} .ui-icon { diff --git a/src/themes/tizen/common/jquery.mobile.collapsible.less b/src/themes/tizen/common/jquery.mobile.collapsible.less index b6e4a0e..7097216 100644 --- a/src/themes/tizen/common/jquery.mobile.collapsible.less +++ b/src/themes/tizen/common/jquery.mobile.collapsible.less @@ -45,7 +45,7 @@ padding-left: 40px; } .ui-btn-icon-right .ui-btn-inner { - padding-left: 12px; padding-right: 40px; + padding-left: 0px; padding-right: 40px; } .ui-btn-icon-top .ui-btn-inner, .ui-btn-icon-bottom .ui-btn-inner { padding-right: 40px; text-align: center; } diff --git a/src/themes/tizen/common/jquery.mobile.forms.checkboxradio.less b/src/themes/tizen/common/jquery.mobile.forms.checkboxradio.less index 45dc946..4d28ebd 100644 --- a/src/themes/tizen/common/jquery.mobile.forms.checkboxradio.less +++ b/src/themes/tizen/common/jquery.mobile.forms.checkboxradio.less @@ -130,15 +130,15 @@ background-image: url(images/00_check_checking.png), url(images/00_check_bg.png); background-repeat: no-repeat; } -.ui-icon-checkbox-off-press { +.ui-btn-down-s .ui-icon-checkbox-off { width: @checkbox-radio-size-width; height: @checkbox-radio-size-height; - background-image: url(images/00_check_bg_press.png); + background-image: url(images/00_check_press.png), url(images/00_check_bg_press.png); } -.ui-icon-checkbox-on-press { +.ui-btn-down-s .ui-icon-checkbox-on { width: @checkbox-radio-size-width; height: @checkbox-radio-size-height; - background-image: url(images/00_check_checking.png), url(images/00_check_bg_press.png); + background-image: url(images/00_check_press.png), url(images/00_check_bg_press.png); background-repeat: no-repeat; } .favorite { @@ -166,13 +166,13 @@ height: @checkbox-radio-size-height; background-image: url(images/00_button_radio_select.png), url(images/00_button_radio.png); } -.ui-icon-radio-on-press { +.ui-btn-down-s .ui-icon-radio-on { width: @checkbox-radio-size-width; height: @checkbox-radio-size-height; - background-image: url(images/00_button_radio.png); + background-image: url(images/00_button_radio_press.png), url(images/00_button_radio_press_bg.png); } -.ui-icon-radio-off-press { +.ui-btn-down-s .ui-icon-radio-off { width: @checkbox-radio-size-width; height: @checkbox-radio-size-height; - background-image: url(images/00_button_radio.png); + background-image: url(images/00_button_radio_press.png), url(images/00_button_radio_press_bg.png); } diff --git a/src/themes/tizen/common/jquery.mobile.listview.less b/src/themes/tizen/common/jquery.mobile.listview.less index a9bfc18..3263090 100644 --- a/src/themes/tizen/common/jquery.mobile.listview.less +++ b/src/themes/tizen/common/jquery.mobile.listview.less @@ -335,6 +335,7 @@ li.ui-li-thumbnail-right { padding-top : 0px; padding-bottom : 0px; + color : @color_list_editfield; } } @@ -444,7 +445,7 @@ li.ui-li-thumbnail-right { width : 100%; height : 2 * @unit_base; - background : @color_list_divider_text; + background : @color_list_divider_line; } &.ui-btn-down-s { @@ -616,7 +617,7 @@ li.ui-li-thumbnail-right { position : absolute; right : 0px; - top : 16 * @unit_base; + top : 12 * @unit_base; width : 60%; .LESStext-ellipsis(); @@ -852,6 +853,7 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub { &.ui-li-bubble-left { color: @color_list_bubble_receive_text; > .ui-li-bubble-time { + text-align: left; color: @color_list_bubble_time_receive_text; } } @@ -859,6 +861,7 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub { &.ui-li-bubble-right { color: @color_list_bubble_sent_text; > .ui-li-bubble-time { + text-align: right; color: @color_list_bubble_time_sent_text; } } @@ -877,6 +880,7 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub { span.ui-li-bubble-time { font-weight: bold; + width: 70 * @unit_base; } // Common .ui-li-bubble-receive, @@ -902,9 +906,9 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub { .ui-li-bubble-left { //float: left; margin-left: 0px; - margin-right: 1.6rem; + margin-right: 100 * @unit_base; border-image-source: url(images/00_messagebubble_bg_receive.9.png); - border-image-slice: 57 14 21 48 fill; + border-image-slice: 60 23 20 57 fill; border-image-width: auto; padding: 9px 14px 21px 48px; @@ -918,7 +922,7 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub { } .ui-li-bubble-sent, .ui-li-bubble-right { - margin-left: 1.6rem; + margin-left: 100 * @unit_base; margin-right: 0px; border-image-source: url(images/00_messagebubble_bg_sent.9.png); border-image-slice: 55 47 20 13 fill; diff --git a/src/themes/tizen/common/jquery.mobile.theme.less b/src/themes/tizen/common/jquery.mobile.theme.less index 428ae5d..cb2340c 100644 --- a/src/themes/tizen/common/jquery.mobile.theme.less +++ b/src/themes/tizen/common/jquery.mobile.theme.less @@ -115,10 +115,10 @@ img { position : absolute; display: inline-block; - height: 16 * @unit_base; - width: 16 * @unit_base; + height: 20 * @unit_base; + width: 20 * @unit_base; margin-left: 8 * @unit_base; - margin-top : 24 * @unit_base; + margin-top : 22 * @unit_base; } .ui-title-text-sub { @@ -214,7 +214,7 @@ &.ui-title-multiline { img { - margin-top : 14 * @unit_base; + margin-top : 23 * @unit_base; } .ui-title { @@ -224,6 +224,9 @@ margin: 9*@unit_base 8*@unit_base 22*@unit_base 8*@unit_base; } + img + .ui-title + .ui-title-text-sub { + left : 33 * @unit_base; + } } } @@ -280,7 +283,7 @@ >[data-role="button"] { font-size : 15 * @unit_base; font-weight : bold; - color : @color_tabbar_btn_normal; + color : @color_button_text_normal; } [data-role="controlgroup"] { @@ -329,7 +332,7 @@ } .ui-btn-text { font-size : 17 * @unit_base; - color : rgba(58, 58, 58, 1); + color : color_button_text_normal; } &.ui-corner-right { diff --git a/src/themes/tizen/common/jquery.mobile.tizen.fastscroll.less b/src/themes/tizen/common/jquery.mobile.tizen.fastscroll.less index af9e52f..9c5e5ed 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.fastscroll.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.fastscroll.less @@ -74,11 +74,10 @@ background: @color_fastscroll_popup_bg; color: @color_fastscroll_popup_text; padding:10*@unit_base 30*@unit_base; - -ms-box-shadow: 8*@unit_base 10*@unit_base 0*@unit_base @color_fastscroll_popup_shadow; - -o-box-shadow: 8*@unit_base 10*@unit_base 0*@unit_base @color_fastscroll_popup_shadow; - -moz-box-shadow: 8*@unit_base 10*@unit_base 0*@unit_base @color_fastscroll_popup_shadow; - -webkit-box-shadow: 8*@unit_base 10*@unit_base 0*@unit_base @color_fastscroll_popup_shadow; - box-shadow: 8*@unit_base 10*@unit_base 0*@unit_base @color_fastscroll_popup_shadow; + border: 1px solid @color_fastscroll_popup_border; + border-radius: .1em; + box-shadow: -2px -2px 2px #fff, 8*@unit_base 10*@unit_base 4*@unit_base @color_fastscroll_popup_shadow; + text-shadow: 0px -2px -2px @color_fastscroll_popup_shadow; text-align: center; font-size: 75*@unit_base; font-weight: bold; @@ -88,38 +87,34 @@ top: 50%; } -li.ui-fastscroll-hover { - color : @color_fastscroll_popup_bg; -} - li.ui-fastscroll-hover, -li.ui-fastscroll-hover-up, li.ui-fastscroll-hover-down { - background : @color_list_bg; - border-style : solid; border-color : @color_fastscroll_popup_bg; border-width : 0px; - border-right-width : 3 * @unit_base; - border-left-width : 1px; - border-left-color : @color_list_bg; + + padding-top : 0px; + padding-bottom : 0px; } li.ui-fastscroll-hover { - padding-top : @unit_base; - padding-bottom : @unit_base; -} + background : @color_list_bg; + color : @color_fastscroll_popup_bg; -li.ui-fastscroll-hover-first-item { - padding-top : 2 * @unit_base; + border-top-width : 3 * @unit_base; + border-right-width : 3 * @unit_base; + border-left-width : 1px; + border-left-color : @color_list_bg; } -li.ui-fastscroll-hover-up { - border-top-width : 3 * @unit_base; - padding-top : 0px; +li.ui-fastscroll-hover-first-item { + border-top-width : 0px; + padding-top : 1.5 * @unit_base; + padding-bottom : 1.5 * @unit_base; } li.ui-fastscroll-hover-down { - border-bottom-width : 3 * @unit_base; - padding-bottom : 0px; + border-top-width : 3 * @unit_base; + border-left-width : 3 * @unit_base; + padding-bottom : 2 * @unit_base; } diff --git a/src/themes/tizen/common/jquery.mobile.tizen.notification.less b/src/themes/tizen/common/jquery.mobile.tizen.notification.less index 08e689d..d99b2f4 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.notification.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.notification.less @@ -193,5 +193,6 @@ margin-bottom: 4 * @unit_base; margin-left: 8 * @unit_base; margin-right: 8 * @unit_base; + padding-top: 8 * @unit_base; color: @color_smallpopup_text; } diff --git a/src/themes/tizen/common/jquery.mobile.tizen.popup.less b/src/themes/tizen/common/jquery.mobile.tizen.popup.less index 227f10a..2c5cacd 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.popup.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.popup.less @@ -5,8 +5,7 @@ @popup-ratio: 86.12%; .ui-popup-screen { - background: #000000; - opacity: 0; + opacity: 0; position: absolute; top: 0; left: 0; @@ -16,7 +15,9 @@ } .ui-overlay-dim { - opacity: 0.7; + background-image: url('images/popup_bg.png'); + background-size: 100% 100%; + opacity: 1; } @@ -28,7 +29,6 @@ position: absolute; width: @popup-ratio; z-index: (@z_base_popup + 1) !important; - background: @color_popup_text_bg; text-align: center; outline-color: @color_list_bg; .LESSdisplaybox(); @@ -46,13 +46,18 @@ width : 100%; } word-wrap : break-word; + -ms-border-radius : .3em; + -o-border-radius : .3em; + -webkit-border-radius : .3em; + -moz-border-radius : .3em; + border-radius : .3em; } .ui-popup-title { width: 100%; height: 40 * @unit_base; text-align : left; - color : @color_bar_title_text; + color : @color_popup_title_text; font-size: @font_size_popup_basic_style_title; font-weight : bold; @@ -60,7 +65,7 @@ h1 { font-size: @font_size_popup_basic_style_title; font-weight : bold; - color : @color_bar_title_text; + color : @color_popup_title_text; margin : 0px; padding-top : 10 * @unit_base; diff --git a/src/themes/tizen/common/jquery.mobile.tizen.progressbar.less b/src/themes/tizen/common/jquery.mobile.tizen.progressbar.less index d153b80..b046dbc 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.progressbar.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.progressbar.less @@ -22,7 +22,6 @@ color-stop(1, @color_progress_value1) ); .LESSborder-radius-all( 10 * @unit_base ); - .LESSbox-shadow(-1px, -1px, 1px, rgb(179, 200, 226)); } .ui-progressbar-bg { @@ -38,7 +37,6 @@ border: 1px; border-style: solid; border-color: @color_progress_border; - .LESSbox-shadow(1px, -1px, 1px, @color_progress_border); background-color: @color_progress_bar0; } @@ -57,6 +55,6 @@ color-stop(0, @color_progress_bar1), color-stop(1, @color_progress_bar0) ); - .LESSbox-shadow(1px, 1px, 0px, white); + .LESSbox-shadow(0px, 0px, 2px, @color_progress_shadow); .LESSborder-radius-all( 10 * @unit_base ); } diff --git a/src/themes/tizen/common/jquery.mobile.tizen.scrollview.handler.less b/src/themes/tizen/common/jquery.mobile.tizen.scrollview.handler.less index bdcb4d4..0981c68 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.scrollview.handler.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.scrollview.handler.less @@ -9,21 +9,21 @@ } .ui-handler-visible { - opacity: 1; + opacity: 1; } .ui-handler-direction-y { top : 10 * @unit_base_handler; - right : 10 * @unit_base_handler; + right : 0 * @unit_base_handler; bottom : 10 * @unit_base_handler; - width : 48 * @unit_base_handler; + width : 36 * @unit_base_handler; } .ui-handler-direction-x { right : 10 * @unit_base_handler; - bottom : 10 * @unit_base_handler; + bottom : 0 * @unit_base_handler; left : 10 * @unit_base_handler; - height : 48 * @unit_base_handler; + height : 36 * @unit_base_handler; } .ui-handler-track { @@ -32,19 +32,32 @@ height : 100%; } -.ui-handler-thumb { +.ui-handler-handle { position : absolute; top : 0; left : 0; +} + +.ui-handler-direction-x .ui-handler-handle { + width : 234 * @unit_base_handler; + height : 36 * @unit_base_handler; +} + +.ui-handler-direction-y .ui-handler-handle { + width : 36 * @unit_base_handler; + height : 234 * @unit_base_handler; +} + +.ui-handler-thumb { background-position : center; background-repeat : no-repeat; - .LESSborder-radius-all(5 * @unit_base_handler); + .LESSborder-radius-all(11 * @unit_base_handler); } .ui-handler-direction-y .ui-handler-thumb { - width : 48 * @unit_base_handler; - height : 214 * @unit_base_handler; - background-size : 48 * @unit_base_handler 40 * @unit_base_handler; + width : 23 * @unit_base_handler; + height : 229 * @unit_base_handler; + background-size : 23 * @unit_base_handler 37 * @unit_base_handler; } .ui-handler-direction-x .ui-handler-thumb { diff --git a/src/themes/tizen/common/jquery.mobile.tizen.scrollview.less b/src/themes/tizen/common/jquery.mobile.tizen.scrollview.less index 8b90007..d834164 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.scrollview.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.scrollview.less @@ -55,7 +55,7 @@ width: 5 * @unit_base; height: 100%; .LESSborder-radius-all(2 * @unit_base); - .LESSbox-shadow(1 * @unit_base, 1 * @unit_base, 2 * @unit_base, rgb(148, 146, 140)) + .LESSbox-shadow(1 * @unit_base, 1 * @unit_base, 4 * @unit_base, @color_scrollbar_thumb_shadow) } .ui-scrollbar-x .ui-scrollbar-thumb { diff --git a/src/themes/tizen/common/jquery.mobile.tizen.slider.less b/src/themes/tizen/common/jquery.mobile.tizen.slider.less index f45227b..ee17ef6 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.slider.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.slider.less @@ -32,7 +32,7 @@ select.ui-slider-switch { color-stop(0, @color_progress_bar1), color-stop(1, @color_progress_bar0) ); - .LESSbox-shadow(1px, 1px, 0px, white); + .LESSbox-shadow(0px, 0px, 2px, @color_progress_shadow); .LESSborder-radius-all( 10 * @unit_base ); } @@ -112,7 +112,6 @@ div.ui-slider:not(.ui-toggle-switch) { border: 1px; border-style: solid; border-color: @color_progress_border; - .LESSbox-shadow(1px, 1px, 0px, @color_progress_shadow); background-color: @color_progress_bar0; .ui-btn { @@ -172,7 +171,6 @@ a.ui-slider-handle { color-stop(1, @color_progress_value1) ); .LESSborder-radius-all( 10 * @unit_base ); - .LESSbox-shadow(-1px, -1px, 1px, rgb(179, 200, 226)); } .ui-slider-handle-press { diff --git a/src/themes/tizen/common/jquery.mobile.tizen.splitview.less b/src/themes/tizen/common/jquery.mobile.tizen.splitview.less index 399d4f3..54cd475 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.splitview.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.splitview.less @@ -1,5 +1,7 @@ @import "config.less"; +@unit_base_splitview : @unit_base * 0.5; + .ui-splitview { margin: 0; padding: 0; @@ -25,7 +27,7 @@ } .ui-splitview .ui-spliter-bar { background-color: @color_splitview_spliter_bar; - border-color: black; + border-color: @color_splitview_spliter_border; border-style: solid; } .ui-splitview .ui-spliter-handle { @@ -41,45 +43,48 @@ background-size: 100% 100%; } .ui-direction-horizontal > .ui-spliter { - width: 60px; + width: 60 * @unit_base_splitview; } .ui-direction-vertical > .ui-spliter { - height: 60px; + height: 60 * @unit_base_splitview; } .ui-direction-horizontal > .ui-spliter > .ui-spliter-bar { - width: 13px; - margin: 0 0 0 25px; - border-width: 1px 1px 1px 0; + width: 13 * @unit_base_splitview; + margin: 0 0 0 25 * @unit_base_splitview; + border-width: 0 1px 0 1px; } .ui-direction-vertical > .ui-spliter > .ui-spliter-bar { - height: 13px; - margin: 25px 0 0 0; - border-width: 0 1px 1px 1px; + height: 13 * @unit_base_splitview; + margin: 25 * @unit_base_splitview 0 0 0; + border-width: 1px 0 1px 0; } .ui-spliter-active > .ui-spliter-bar { background-color: @color_splitview_spliter_bar_active; + border-color: @color_splitview_spliter_bar_active; } .ui-direction-horizontal > .ui-spliter > .ui-spliter-bar > .ui-spliter-handle { - width: 13px; - height: 26px; + width: 13 * @unit_base_splitview; + height: 26 * @unit_base_splitview; background-image: url(./images/00_splite_handler_v.png); + background-repeat:repeat-x; } .ui-direction-vertical > .ui-spliter > .ui-spliter-bar > .ui-spliter-handle { - width: 26px; - height: 13px; + width: 26 * @unit_base_splitview; + height: 13 * @unit_base_splitview; background-image: url(./images/00_splite_handler_h.png); + background-repeat:repeat-y; } .ui-direction-horizontal > .ui-fixed { - width: 0px; + width: 0; } .ui-direction-horizontal > .ui-fixed > .ui-spliter-bar { - width: 5px; + width: 5 * @unit_base_splitview; } .ui-direction-vertical > .ui-fixed { - height: 0px; + height: 0; } .ui-direction-vertical > .ui-fixed > .ui-spliter-bar { - height: 5px; + height: 5 * @unit_base_splitview; } .ui-fixed .ui-spliter-handle { display: none; diff --git a/src/themes/tizen/common/jquery.mobile.tizen.swipe.less b/src/themes/tizen/common/jquery.mobile.tizen.swipe.less index eb66248..c67e69f 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.swipe.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.swipe.less @@ -3,12 +3,12 @@ @list-li-padding-horizontal: 16 * @unit_base; .ui-swipe { + padding: 0 !important; list-style-type: none; - overflow: hidden; } .ui-swipe-item { - height: 26 * @unit_base; + height: 56 * @unit_base; -ms-user-select: none; -o-user-select: none; -moz-user-select: none; @@ -16,9 +16,12 @@ -user-select: none; opacity: 0; text-align : center; + background-color: @color_list_swipe_bg; + margin-left : -13 * @unit_base; + margin-right : -13 * @unit_base; .ui-btn { - margin-top: -1.5em ! important; + margin-top: -1.2em ! important; position: relative ! important; } p { diff --git a/src/themes/tizen/common/jquery.mobile.tizen.tabbar.less b/src/themes/tizen/common/jquery.mobile.tizen.tabbar.less index 5e7390d..712fd27 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.tabbar.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.tabbar.less @@ -28,6 +28,14 @@ -0-border-radius : 0px; -ms-border-radius : 0px; -webkit-border-radius : 0px; + + &:not(.ui-btn-icon-only) .ui-btn-text { + display: block; + vertical-align: middle; + padding-bottom : 6 * @unit_base; + margin-left: 6 * @unit_base; + margin-right: 6 * @unit_base; + } } .ui-icon { @@ -45,10 +53,15 @@ } a.ui-state-persist, a.ui-state-persist.ui-btn-active, a.ui-btn-show-style { color : @color_tabbar_btn_pressed; + + .ui-btn-text { + border-bottom-width: 3 * @unit_base; + border-bottom-color: @color_tabbar_btn_pressed; + border-bottom-style: solid; + } } a.ui-btn-hover-s.ui-btn-down-s { &:not(.ui-state-persist) { - color : @color_tabbar_btn_pressed; background: @color_tabbar_btn_tab_press; } } @@ -60,9 +73,13 @@ } a.ui-btn-active, .ui-btn-show-style { color : @color_tabbar_btn_pressed; + .ui-btn-text { + border-bottom-width: 3 * @unit_base; + border-bottom-color: @color_tabbar_btn_pressed; + border-bottom-style: solid; + } } a.ui-btn.ui-btn-hover-s.ui-btn-down-s { - color : @color_tabbar_btn_pressed; background: @color_tabbar_btn_tab_press; } } @@ -134,8 +151,7 @@ .ui-btn-inner { height : 54 * @unit_base; .ui-btn-text { - padding-top : 0px; - line-height : 85 * @unit_base; + padding-bottom: 1 * @unit_base; } .ui-icon { top : 0px; diff --git a/src/themes/tizen/common/jquery.mobile.tizen.tokentextarea.less b/src/themes/tizen/common/jquery.mobile.tizen.tokentextarea.less index c7aa039..5b891eb 100644 --- a/src/themes/tizen/common/jquery.mobile.tizen.tokentextarea.less +++ b/src/themes/tizen/common/jquery.mobile.tizen.tokentextarea.less @@ -10,9 +10,9 @@ display : inline-block; text-align : center; position : relative; - margin-left : 5px; - margin-right : 5px; - padding : 10px 0px; + margin-left : .3em; + margin-right : .3em; + padding : .6em 0em; color : @color_tokentextarea_label_text; font-weight : bold; text-align : center; @@ -24,7 +24,7 @@ position : relative; border : 0 !important; padding : 0 !important; - margin : 8px; + margin : .5em; color : @color_tokentextarea_input_text; text-align : left; font-size : 1em; @@ -43,11 +43,8 @@ text-align : center; cursor : pointer; position : relative; - margin-left : 5px; - margin-right : 5px; - margin-bottom : 5px; - margin-top : 5px; - padding : 3px 8px; + margin : .3em; + padding : .2em .5em; font-size : 1em; text-shadow : 0 .1em .1em rgba(0,0,0,.3); -ms-border-radius : .2em; @@ -64,18 +61,18 @@ div.ui-tokentextarea-block { background-color : @color_tokentextarea_block_bg; - background-image : url(./images/00_contacts_button_header.png); + background-image : -webkit-gradient(linear, left top, left bottom, from(@color_tokentextarea_block_bg), to(rgb(115, 148, 189))); background-size : contain; background-repeat : no-repeat; - padding-left : 11px; + padding-left : .7em; } div.ui-tokentextarea-sblock { background-color : @color_tokentextarea_press_bg; - background-image : url(./images/00_contacts_button_header_press.png); + background-image : -webkit-gradient(linear, left top, left bottom, from(@color_tokentextarea_press_bg), to(rgb(75, 142, 222))); background-size : contain; background-repeat : no-repeat; - padding-left : 11px; + padding-left : .7em; } .ui-tokentextarea .ui-tokentextarea-desclabel { diff --git a/src/themes/tizen/tizen-white/images/00_contacts_button_header.png b/src/themes/tizen/tizen-black/images/00_effect_title_tab_bounce_left.png similarity index 54% rename from src/themes/tizen/tizen-white/images/00_contacts_button_header.png rename to src/themes/tizen/tizen-black/images/00_effect_title_tab_bounce_left.png index 2046225..8eca760 100644 Binary files a/src/themes/tizen/tizen-white/images/00_contacts_button_header.png and b/src/themes/tizen/tizen-black/images/00_effect_title_tab_bounce_left.png differ diff --git a/src/themes/tizen/tizen-black/images/00_contacts_button_header_press.png b/src/themes/tizen/tizen-black/images/00_effect_title_tab_bounce_right.png similarity index 59% rename from src/themes/tizen/tizen-black/images/00_contacts_button_header_press.png rename to src/themes/tizen/tizen-black/images/00_effect_title_tab_bounce_right.png index 5c814b0..9af8c07 100644 Binary files a/src/themes/tizen/tizen-black/images/00_contacts_button_header_press.png and b/src/themes/tizen/tizen-black/images/00_effect_title_tab_bounce_right.png differ diff --git a/src/themes/tizen/tizen-black/images/00_messagebubble_bg_receive.9.png b/src/themes/tizen/tizen-black/images/00_messagebubble_bg_receive.9.png index a4a7863..20e8afc 100644 Binary files a/src/themes/tizen/tizen-black/images/00_messagebubble_bg_receive.9.png and b/src/themes/tizen/tizen-black/images/00_messagebubble_bg_receive.9.png differ diff --git a/src/themes/tizen/tizen-black/images/00_scroll_bar_handler.png b/src/themes/tizen/tizen-black/images/00_scroll_bar_handler.png index 52ffbef..399413e 100644 Binary files a/src/themes/tizen/tizen-black/images/00_scroll_bar_handler.png and b/src/themes/tizen/tizen-black/images/00_scroll_bar_handler.png differ diff --git a/src/themes/tizen/tizen-black/images/00_scroll_bar_handler_hor.png b/src/themes/tizen/tizen-black/images/00_scroll_bar_handler_hor.png index 76a84a9..dad9669 100644 Binary files a/src/themes/tizen/tizen-black/images/00_scroll_bar_handler_hor.png and b/src/themes/tizen/tizen-black/images/00_scroll_bar_handler_hor.png differ diff --git a/src/themes/tizen/tizen-black/images/00_splite_handler_h.png b/src/themes/tizen/tizen-black/images/00_splite_handler_h.png old mode 100644 new mode 100755 index f6f2c97..dfcc1b9 Binary files a/src/themes/tizen/tizen-black/images/00_splite_handler_h.png and b/src/themes/tizen/tizen-black/images/00_splite_handler_h.png differ diff --git a/src/themes/tizen/tizen-black/images/00_splite_handler_v.png b/src/themes/tizen/tizen-black/images/00_splite_handler_v.png old mode 100644 new mode 100755 index d0cf6bb..2ced25b Binary files a/src/themes/tizen/tizen-black/images/00_splite_handler_v.png and b/src/themes/tizen/tizen-black/images/00_splite_handler_v.png differ diff --git a/src/themes/tizen/tizen-black/images/popup_bg.png b/src/themes/tizen/tizen-black/images/popup_bg.png new file mode 100644 index 0000000..49a3573 Binary files /dev/null and b/src/themes/tizen/tizen-black/images/popup_bg.png differ diff --git a/src/themes/tizen/tizen-black/style.less b/src/themes/tizen/tizen-black/style.less index fdb3097..8e12899 100644 --- a/src/themes/tizen/tizen-black/style.less +++ b/src/themes/tizen/tizen-black/style.less @@ -24,30 +24,35 @@ List ***************************************************************************/ @color_list_bg: rgba(32, 35, 39, 1); /* B0211 */ -@color_list_press : rgba(87, 135, 194, 1); /* B041 */ -@color_list_border_bottom: rgba(45, 45, 45, 0.5); /* B0221 */ +@color_list_press : rgba(112, 169, 238, 1); /* B041 */ +@color_list_border_bottom: rgba(12, 15, 20, 1); /* B0223 */ @color_list_main_text_focus: rgba(255, 255, 255, 1); @color_list_main_text_unfocus: rgba(215, 215, 215, 1); @color_list_sub_text_default: rgba(128, 128, 128, 1); @color_list_divider_expand_div : rgba(0, 0, 0, 0.5); -@color_list_divider_bg : rgba(32, 35, 39, 1); /* W021L1 */ -@color_list_divider_text : rgba(112, 169, 238, 1); /* W021L2 */ +@color_list_divider_bg : rgba(32, 35, 39, 1); /* W021L1 */ +@color_list_divider_line : rgba(59, 115, 182, 1); /* W021L2 */ +@color_list_divider_text : rgba(112, 169, 238, 1); /* W021L3 */ + +@color_list_swipe_bg : rgba(23, 25, 28, 1); /* B0212 */ @color_list_dialogue_bg : rgba(42, 45, 48, 1); -@color_dialogue_main_text: rgba(59, 115, 182, 1); +@color_dialogue_main_text: rgba(112, 169, 238, 1); /* F011L5 */ @color_dialogue_border_right: rgba(12, 15, 20, 1); @color_list_expanded_bg : rgba(220, 218, 211, 1); -@color_list_bubble_sent_text: rgb(0, 0, 0); -@color_list_bubble_receive_text: rgb(255, 255, 255); -@color_list_bubble_sos_text: rgb(233, 73, 73); -@color_list_bubble_date_text: rgb(104, 104, 104); +@color_list_editfield : rgba(215, 215, 215, 1); /* F011L1 */ + +@color_list_bubble_sent_text: rgb(0, 0, 0); /* W051 */ +@color_list_bubble_receive_text: rgb(0, 0, 0); /* W051 */ +@color_list_bubble_sos_text: rgb(233, 73, 73); /* F011L15 */ +@color_list_bubble_date_text: rgb(104, 104, 104); /* F011L18 */ @color_list_bubble_date_bg: rgba(225, 225, 225, 0); -@color_list_bubble_time_sent_text: rgb(57, 166, 215); -@color_list_bubble_time_receive_text: rgb(211, 0, 0); -@color_list_bubble_time_sos_text: rgb(211, 0, 0); +@color_list_bubble_time_sent_text: rgb(139, 139, 139); /* F011L16 */ +@color_list_bubble_time_receive_text: rgb(139, 139, 139); /* F011L17 */ +@color_list_bubble_time_sos_text: rgb(233, 73, 73); /* F011L15 */ @color_list_bubble_name_text: rgb(139, 139, 139); @color_list_bubble_help_text: rgb(154, 154, 154); @color_list_bubble_link_text: rgb(34, 129, 157); @@ -68,6 +73,7 @@ @color_fastscroll_popup_bg: rgba(59, 115, 182, 1); /* B0731 : 00_fast_scroll_popup_bg.png */ @color_fastscroll_popup_shadow: rgba(199, 199, 199, 0.5); @color_fastscroll_popup_text: rgba(255, 255, 255, 1); /* B0732 : Scroll popup text */ +@color_fastscroll_popup_border: rgba(100, 100, 100, 0.5); /*************************************************************************** @@ -95,25 +101,25 @@ @color_button_EditText: rgb(249, 249, 249); @color_button_EditTextPress: rgb(61, 61, 61); -@color_button_text_normal: rgb(58, 58, 58); +@color_button_text_normal: rgb(186, 186, 186); @color_button_text_press: rgb(255, 255, 255); @color_button_text_white: rgb(249, 249, 249); -@color_button_normal: rgb(32, 35, 39); -@color_button_normal_webkit: -webkit-linear-gradient(top, rgb(32, 35, 39), rgb(32, 35, 39)); -@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_normal: rgb(60, 64, 68); +@color_button_normal_webkit: -webkit-linear-gradient(top, rgb(53, 57, 61), rgb(45, 48, 51)); +@color_button_normal_moz: -moz-linear-gradient(top, rgb(53, 57, 61), rgb(45, 48, 51)); +@color_button_normal_o: -o-linear-gradient(top, rgb(53, 57, 61), rgb(45, 48, 51)); +@color_button_normal_ms: -ms-linear-gradient(top, rgb(53, 57, 61), rgb(45, 48, 51)); +@color_button_press: rgb(51, 99, 157); -@color_button_inner: rgb(32, 35, 39); -@color_button_inner_webkit: -webkit-linear-gradient(top, rgb(32, 35, 39), rgb(32, 35, 39)); -@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)); +@color_button_inner: rgb(60, 64, 68); +@color_button_inner_webkit: -webkit-linear-gradient(top, rgb(60, 64, 68), rgb(44, 46, 49)); +@color_button_inner_moz: -moz-linear-gradient(top, rgb(60, 64, 68), rgb(44, 46, 49)); +@color_button_inner_o: -o-linear-gradient(top, rgb(60, 64, 68), rgb(44, 46, 49)); +@color_button_inner_ms: -ms-linear-gradient(top, rgb(60, 64, 68), rgb(44, 46, 49)); -@button_shadow_outer: 0 0 1px 1px rgba(0, 0, 0, 1); -@button_shadow_inner: none; +@button_shadow_outer: 0 0 1px 1px rgba(83, 86, 90, 1); +@button_shadow_inner: 0 0 1px 1px rgba(67, 70, 73, 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))); @@ -138,7 +144,7 @@ background: @color_button_normal_o; background: @color_button_normal_ms; border: 1px solid; - border-color: rgba(0, 0, 0, 1); + border-color: rgba(42, 44, 47, 1); .LESSbox-shadow-line( @button_shadow_outer ); } .LESSbutton_inner_box_style{ @@ -186,7 +192,7 @@ @color_ctxpopup_border_top: rgb(91, 91, 91); @color_ctxpopup_border_bottom: rgb(45, 45, 45); -@color_ctxbutton_press: rgb(59, 115, 182); +@color_ctxbutton_press: rgb(42, 137, 194); /* B044 */ @color_ctxpopup_timepicker_text: rgba( 255, 255, 255, 0.7 ); @color_ctxpopup_timepicker_text_focus: rgba( 255, 255, 255, 1 ); @@ -198,6 +204,7 @@ @color_scrollbar: rgb(57, 59, 65); @color_scrollview_indicator_start: rgb(186,186,186); @color_scrollview_indicator_end: rgb(32,35,39); +@color_scrollbar_thumb_shadow: rgba(0, 0, 0, 50); /*************************************************************************** Date Time picker @@ -217,6 +224,7 @@ ***************************************************************************/ @color_popup_center_progressbar_title: rgba(153, 153, 153, 1); @color_popup_title_bg: rgba(80, 147, 182, 255); /* popup_title_bg.png */ +@color_popup_title_text: rgba(125, 169, 221, 1); /* B063L9 : Basic Style_title */ @color_popup_button_bg: rgba(42, 45, 48, 1); @color_popup_font: rgba(248, 246, 239, 1); /* maybe not use only popupwindow*/ @@ -271,7 +279,7 @@ /*************************************************************************** Tickernoti ***************************************************************************/ -@color_ticker_bg: rgb(68, 68, 68); +@color_ticker_bg: rgb(52, 52, 50); /* B061L5 */ @color_ticker_text1: rgb(255, 255, 255); @color_ticker_text2: rgb(255, 255, 255); @color_ticker_btn: rgb(64, 64, 64); @@ -281,14 +289,15 @@ /*************************************************************************** Smallpopup ***************************************************************************/ -@color_smallpopup_bg: rgb(68, 68, 68); +@color_smallpopup_bg: -webkit-linear-gradient(top, @color_bg 0%, rgb(153, 153, 153 +) 18%, rgb(68, 68, 68) 20%, rgb(68, 68, 68) 100%); @color_smallpopup_text: rgb(255, 255, 255); /*************************************************************************** Slider ***************************************************************************/ @color_slider_handle_text: rgb(255, 255, 255); -@color_slider_popup_text: rgb(249, 249, 249); +@color_slider_popup_text: rgb(76, 81, 88); /* W0632 */ @color_slider_left_text: rgb(186, 186, 186); @color_slider_right_text: rgb(186, 186, 186); @color_slider_label_text: rgb(255, 255, 255); @@ -297,18 +306,20 @@ /*************************************************************************** Progress ***************************************************************************/ -@color_progress_bar0: rgb(0, 0, 0); -@color_progress_bar1: rgb(29, 31, 34); -@color_progress_border: rgb(29, 31, 34); -@color_progress_value0: rgb(54, 119, 195); -@color_progress_value1: rgb(29, 31, 34); -@color_progress_shadow: rgb(255, 255, 255); +@color_progress_bar0: rgb(26, 27, 29); +@color_progress_bar1: rgb(46, 47, 51); +@color_progress_outline: rgb(57, 59, 63); +@color_progress_border: rgb(32, 33, 35); +@color_progress_value0: rgb(82, 136, 201); +@color_progress_value1: rgb(54, 90, 113); +@color_progress_shadow: rgb(60, 62, 67); /*************************************************************************** Handler ***************************************************************************/ -@color_scrollview_handler_bg : rgba(150, 150, 150, 0.5); +@color_scrollview_handler_bg : rgba(198, 196, 190, 1); +@color_scrollview_handler_shadow : rgb(0, 0, 0, 0.5); /*************************************************************************** @@ -345,13 +356,14 @@ tokentextarea ***************************************************************************/ @color_tokentextarea_block_text : rgb(255, 255, 255); -@color_tokentextarea_block_bg : rgb(95, 138, 189); -@color_tokentextarea_press_bg : rgb(54, 89, 132); +@color_tokentextarea_block_bg : rgb(118, 157, 204); /* W0711 : Contact button bg normal */ +@color_tokentextarea_press_bg : rgb(64, 147, 247); /* W0713 : Contact button bg press */ @color_tokentextarea_input_text : #222222; @color_tokentextarea_label_text : rgb(128, 128, 128); /*************************************************************************** Splitview ***************************************************************************/ -@color_splitview_spliter_bar : rgb(179, 179, 179); -@color_splitview_spliter_bar_active : rgb(87, 135, 194); +@color_splitview_spliter_bar : rgb(52, 55, 57); /* W131 */ +@color_splitview_spliter_bar_active : rgb(59, 115, 182); /* W132 */ +@color_splitview_spliter_border : rgb(58, 62, 67); diff --git a/src/themes/tizen/tizen-white/images/00_button_radio.png b/src/themes/tizen/tizen-white/images/00_button_radio.png old mode 100644 new mode 100755 index 83a1a54..a916a26 Binary files a/src/themes/tizen/tizen-white/images/00_button_radio.png and b/src/themes/tizen/tizen-white/images/00_button_radio.png differ diff --git a/src/themes/tizen/tizen-white/images/00_button_radio_press.png b/src/themes/tizen/tizen-white/images/00_button_radio_press.png new file mode 100755 index 0000000..462d83e Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_button_radio_press.png differ diff --git a/src/themes/tizen/tizen-white/images/00_button_radio_press_bg.png b/src/themes/tizen/tizen-white/images/00_button_radio_press_bg.png new file mode 100755 index 0000000..e0bae65 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_button_radio_press_bg.png differ diff --git a/src/themes/tizen/tizen-white/images/00_button_radio_select.png b/src/themes/tizen/tizen-white/images/00_button_radio_select.png old mode 100644 new mode 100755 index 8b8ad9d..e76b7a7 Binary files a/src/themes/tizen/tizen-white/images/00_button_radio_select.png and b/src/themes/tizen/tizen-white/images/00_button_radio_select.png differ diff --git a/src/themes/tizen/tizen-white/images/00_check_bg.png b/src/themes/tizen/tizen-white/images/00_check_bg.png old mode 100644 new mode 100755 index 1f60e1b..bb08643 Binary files a/src/themes/tizen/tizen-white/images/00_check_bg.png and b/src/themes/tizen/tizen-white/images/00_check_bg.png differ diff --git a/src/themes/tizen/tizen-white/images/00_check_bg_press.png b/src/themes/tizen/tizen-white/images/00_check_bg_press.png old mode 100644 new mode 100755 index bf665af..6656810 Binary files a/src/themes/tizen/tizen-white/images/00_check_bg_press.png and b/src/themes/tizen/tizen-white/images/00_check_bg_press.png differ diff --git a/src/themes/tizen/tizen-black/images/00_contacts_button_header.png b/src/themes/tizen/tizen-white/images/00_check_press.png old mode 100644 new mode 100755 similarity index 79% rename from src/themes/tizen/tizen-black/images/00_contacts_button_header.png rename to src/themes/tizen/tizen-white/images/00_check_press.png index 2046225..9065f67 Binary files a/src/themes/tizen/tizen-black/images/00_contacts_button_header.png and b/src/themes/tizen/tizen-white/images/00_check_press.png differ diff --git a/src/themes/tizen/tizen-white/images/00_contacts_button_header_press.png b/src/themes/tizen/tizen-white/images/00_contacts_button_header_press.png deleted file mode 100644 index 5c814b0..0000000 Binary files a/src/themes/tizen/tizen-white/images/00_contacts_button_header_press.png and /dev/null differ diff --git a/src/themes/tizen/tizen-white/images/00_messagebubble_bg_receive.9.png b/src/themes/tizen/tizen-white/images/00_messagebubble_bg_receive.9.png index a4a7863..20e8afc 100644 Binary files a/src/themes/tizen/tizen-white/images/00_messagebubble_bg_receive.9.png and b/src/themes/tizen/tizen-white/images/00_messagebubble_bg_receive.9.png differ diff --git a/src/themes/tizen/tizen-white/images/00_scroll_bar_handler.png b/src/themes/tizen/tizen-white/images/00_scroll_bar_handler.png index 52ffbef..399413e 100644 Binary files a/src/themes/tizen/tizen-white/images/00_scroll_bar_handler.png and b/src/themes/tizen/tizen-white/images/00_scroll_bar_handler.png differ diff --git a/src/themes/tizen/tizen-white/images/00_scroll_bar_handler_hor.png b/src/themes/tizen/tizen-white/images/00_scroll_bar_handler_hor.png index 76a84a9..dad9669 100644 Binary files a/src/themes/tizen/tizen-white/images/00_scroll_bar_handler_hor.png and b/src/themes/tizen/tizen-white/images/00_scroll_bar_handler_hor.png differ diff --git a/src/themes/tizen/tizen-white/images/controls/00_search_icon.png b/src/themes/tizen/tizen-white/images/controls/00_search_icon.png old mode 100644 new mode 100755 index 87e8b34..7b06cc0 Binary files a/src/themes/tizen/tizen-white/images/controls/00_search_icon.png and b/src/themes/tizen/tizen-white/images/controls/00_search_icon.png differ diff --git a/src/themes/tizen/tizen-white/images/popup_bg.png b/src/themes/tizen/tizen-white/images/popup_bg.png new file mode 100644 index 0000000..49a3573 Binary files /dev/null and b/src/themes/tizen/tizen-white/images/popup_bg.png differ diff --git a/src/themes/tizen/tizen-white/style.less b/src/themes/tizen/tizen-white/style.less index d042436..13571bd 100644 --- a/src/themes/tizen/tizen-white/style.less +++ b/src/themes/tizen/tizen-white/style.less @@ -33,7 +33,10 @@ @color_list_divider_expand_div : rgba(0, 0, 0, 0.5); @color_list_divider_bg : rgba(248, 246, 239, 1); /* W021L1 */ -@color_list_divider_text : rgba(59, 115, 182, 1); /* W021L2 */ +@color_list_divider_line : rgba(59, 115, 182, 1); /* W021L2 */ +@color_list_divider_text : rgba(59, 115, 182, 1); /* W021L3 */ + +@color_list_swipe_bg : rgba(237, 235, 228, 1); /* B0212 */ @color_list_dialogue_bg : rgba(239, 237, 229, 1); @color_dialogue_main_text: rgba(59, 115, 182, 1); @@ -41,14 +44,16 @@ @color_list_expanded_bg : rgba(220, 218, 211, 1); -@color_list_bubble_sent_text: rgb(0, 0, 0); -@color_list_bubble_receive_text: rgb(255, 255, 255); +@color_list_editfield : rgba(0, 0, 0, 1); /* F011L1 */ + +@color_list_bubble_sent_text: rgb(0, 0, 0); /* W051 */ +@color_list_bubble_receive_text: rgb(0, 0, 0); /* W051 */ @color_list_bubble_sos_text: rgb(233, 73, 73); @color_list_bubble_date_text: rgb(104, 104, 104); @color_list_bubble_date_bg: rgba(225, 225, 225, 0); -@color_list_bubble_time_sent_text: rgb(57, 166, 215); -@color_list_bubble_time_receive_text: rgb(211, 0, 0); -@color_list_bubble_time_sos_text: rgb(211, 0, 0); +@color_list_bubble_time_sent_text: rgb(139, 139, 139); /* F011L16 */ +@color_list_bubble_time_receive_text: rgb(139, 139, 139); /* F011L17 */ +@color_list_bubble_time_sos_text: rgb(233, 73, 73); /* F011L15 */ @color_list_bubble_name_text: rgb(139, 139, 139); @color_list_bubble_help_text: rgb(154, 154, 154); @color_list_bubble_link_text: rgb(34, 129, 157); @@ -69,6 +74,7 @@ @color_fastscroll_popup_bg: rgba(59, 115, 182, 1); /* B0731 : 00_fast_scroll_popup_bg.png */ @color_fastscroll_popup_shadow: rgba(199, 199, 199, 0.5); @color_fastscroll_popup_text: rgba(255, 255, 255, 1); /* B0732 : Scroll popup text */ +@color_fastscroll_popup_border: rgba(100, 100, 100, 0.5); /*************************************************************************** @@ -96,8 +102,8 @@ @color_button_EditText: rgb(249, 249, 249); @color_button_EditTextPress: rgb(61, 61, 61); -@color_button_text_normal: rgb(58, 58, 58); -@color_button_text_press: rgb(248, 246, 239); +@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); @@ -159,7 +165,7 @@ font-weight: normal; font-size: 1.0rem; font-style:normal; - color: @color_button_text_black; + color: @color_button_text_normal; } .LESSbutton_hover_style{ @@ -181,13 +187,13 @@ contextual popup ***************************************************************************/ @color_ctxpopup_text: rgb(255, 255, 255); -@color_ctxpopup_background: rgb(68, 68, 68); +@color_ctxpopup_background: rgb(68, 68, 68); /* B061L4 : Contextual bg */ @color_ctxpopup_border_left: rgb(45, 45, 45); @color_ctxpopup_border_right: rgb(91, 91, 91); @color_ctxpopup_border_top: rgb(91, 91, 91); @color_ctxpopup_border_bottom: rgb(45, 45, 45); -@color_ctxbutton_press: rgb(59, 115, 182); +@color_ctxbutton_press: rgb(42, 137, 194); /* B044 : Contextual effect */ @color_ctxpopup_timepicker_text: rgba( 255, 255, 255, 0.7 ); @color_ctxpopup_timepicker_text_focus: rgba( 255, 255, 255, 1 ); @@ -199,11 +205,12 @@ @color_scrollbar: rgb(198, 196, 190); @color_scrollview_indicator_start: rgb(255,255,255); @color_scrollview_indicator_end: rgb(128,128,128); +@color_scrollbar_thumb_shadow: rgba(0, 0, 0, 50); /*************************************************************************** Date Time picker ***************************************************************************/ -@color_timepicker_selector_color: rgb(59,115,182); +@color_timepicker_selector_color: rgb(87, 135, 194); /* W0811 : Picker bg */ @font_size_datetime_main_text: 22 * @unit_base; @font_size_datetime_sub_text: 16 * @unit_base; @@ -218,6 +225,7 @@ ***************************************************************************/ @color_popup_center_progressbar_title: rgba(153, 153, 153, 1); @color_popup_title_bg: rgba(80, 147, 182, 255); /* popup_title_bg.png */ +@color_popup_title_text: rgba(59, 115, 182, 1); /* B063L9 : Basic Style_title */ @color_popup_button_bg: rgba(248, 246, 239, 1); @color_popup_font: rgba(248, 246, 239, 1); /* maybe not use only popupwindow*/ @@ -282,7 +290,7 @@ /*************************************************************************** Smallpopup ***************************************************************************/ -@color_smallpopup_bg: rgb(68, 68, 68); +@color_smallpopup_bg: -webkit-linear-gradient(top, @color_bg 0%, rgb(153, 153, 153) 18%, rgb(68, 68, 68) 20%, rgb(68, 68, 68) 100%); @color_smallpopup_text: rgb(255, 255, 255); /*************************************************************************** @@ -303,13 +311,14 @@ @color_progress_border: rgb(163, 160, 158); @color_progress_value0: rgb(54, 119, 195); @color_progress_value1: rgb(150, 184, 224); -@color_progress_shadow: rgb(0, 0, 0); +@color_progress_shadow: rgb(104, 102, 101); /*************************************************************************** Handler ***************************************************************************/ -@color_scrollview_handler_bg : rgba(150, 150, 150, 0.5); +@color_scrollview_handler_bg : rgba(198, 196, 190, 1); +@color_scrollview_handler_shadow : rgb(0, 0, 0, 0.5); /*************************************************************************** @@ -346,13 +355,14 @@ tokentextarea ***************************************************************************/ @color_tokentextarea_block_text : rgb(255, 255, 255); -@color_tokentextarea_block_bg : rgb(95, 138, 189); -@color_tokentextarea_press_bg : rgb(54, 89, 132); +@color_tokentextarea_block_bg : rgb(118, 157, 204); /* W0711 : Contact button bg normal */ +@color_tokentextarea_press_bg : rgb(64, 147, 247); /* W0713 : Contact button bg press */ @color_tokentextarea_input_text : #222222; @color_tokentextarea_label_text : rgb(102, 102, 102); /*************************************************************************** Splitview ***************************************************************************/ -@color_splitview_spliter_bar : rgb(179, 179, 179); -@color_splitview_spliter_bar_active : rgb(87, 135, 194); +@color_splitview_spliter_bar : rgb(149, 149, 149); /* W131 */ +@color_splitview_spliter_bar_active : rgb(87, 135, 194); /* W132 */ +@color_splitview_spliter_border : rgb(128, 128, 128); diff --git a/tests/unit-tests/gallery3d/gallery3d-tests.js b/tests/unit-tests/gallery3d/gallery3d-tests.js index cd16f78..b59695e 100644 --- a/tests/unit-tests/gallery3d/gallery3d-tests.js +++ b/tests/unit-tests/gallery3d/gallery3d-tests.js @@ -46,18 +46,17 @@ widget.gallery3d( "select", 1 ); setTimeout( function () { equal( widget.gallery3d( "select" ), imageList[0], "API : select" ); - widget.gallery3d( "next" ); - setTimeout( function () { - equal( widget.gallery3d( "select" ), imageList[1], "API : next" ); + }, 600 ); - widget.gallery3d( "prev" ); - setTimeout( function () { - equal( widget.gallery3d( "select" ), imageList[0], "API : prev" ); - start(); + setTimeout( function () { + equal( widget.gallery3d( "select" ), imageList[1], "API : next" ); + widget.gallery3d( "prev" ); + }, 1200 ); - }, 340 ); - }, 340 ); - }, 340 ); + setTimeout( function () { + equal( widget.gallery3d( "select" ), imageList[0], "API : prev" ); + start(); + }, 1800 ); }); }( jQuery )); diff --git a/tests/unit-tests/slider/index.html b/tests/unit-tests/slider/index.html index b6253ad..9ae888b 100755 --- a/tests/unit-tests/slider/index.html +++ b/tests/unit-tests/slider/index.html @@ -33,6 +33,10 @@
    +
    diff --git a/tests/unit-tests/slider/slider-tests.js b/tests/unit-tests/slider/slider-tests.js index 392bd8c..a923e32 100644 --- a/tests/unit-tests/slider/slider-tests.js +++ b/tests/unit-tests/slider/slider-tests.js @@ -49,4 +49,8 @@ test( "icon slider", function () { unit_slider( $("#slider1") ); }); + + test( "jqm enhancing", function () { + ok( $( "#slider3" ).slider(), "JQM slider enhances select elements" ); + }); }( jQuery )); diff --git a/tests/unit-tests/virtualgrid/index.html b/tests/unit-tests/virtualgrid/index.html index 4aa2282..a99eb80 100644 --- a/tests/unit-tests/virtualgrid/index.html +++ b/tests/unit-tests/virtualgrid/index.html @@ -9,6 +9,7 @@ + Virtualgrid @@ -36,14 +37,6 @@
    - diff --git a/tests/unit-tests/virtualgrid/virtualgrid-tests.js b/tests/unit-tests/virtualgrid/virtualgrid-tests.js index 4ae09a9..1227d80 100755 --- a/tests/unit-tests/virtualgrid/virtualgrid-tests.js +++ b/tests/unit-tests/virtualgrid/virtualgrid-tests.js @@ -5,10 +5,12 @@ * Woosung Sohn */ -( function ( $ ) { +$( document ).ready( function () { + var virtualGrid, startVirtualGridTest; + module( "Virtualgrid" ); - var startVirtualGridTest = function ( virtualGrid ) { + startVirtualGridTest = function ( virtualGrid ) { var $vgView, $vgScrollView, $vgWrapBlocks, @@ -61,19 +63,28 @@ notEqual( $item.children().length, prevColCnt, "Method : resize" ); $item = $( $vgWrapBlocks.first().children()[0] ); - $item.trigger( "click" ); + try { + $item.trigger( "click" ); + } catch ( exception ) { + console.log( "click event exception : " + exception ); + } }); }; - $( document ).bind( "dataloaded" , function () { - var virtualGrid = $( "#virtualgrid-test" ).virtualgrid( "create" , { + /* Load Dummy Data and Init Virtual Grid widget*/ + if ( window.JSON_DATA ) { + // trigger pagecreate + $( "#virtualgrid_demo_page" ).page(); + + virtualGrid = $( "#virtualgrid-test" ).virtualgrid( "create", { itemData: function ( idx ) { return JSON_DATA[ idx ]; }, numItemData: JSON_DATA.length, cacheItemData: function ( minIdx, maxIdx ) { } }); - startVirtualGridTest( virtualGrid ); - }); -}( jQuery )); + } else { + console.log ( "Virtual Grid Init Fail." ); + } +} );