diff --git a/apps/documenteditor/mobile/app/view/Search.js b/apps/documenteditor/mobile/app/view/Search.js index a0cf2fe19..54b4d4f1a 100644 --- a/apps/documenteditor/mobile/app/view/Search.js +++ b/apps/documenteditor/mobile/app/view/Search.js @@ -144,7 +144,11 @@ define([ searchBar = $$('.searchbar.document'); if (searchBar.length < 1) { - $(me.el).find('.pages .page').first().prepend(_layout.find('#search-panel-view').html()); + $(_layout.find('#search-panel-view').html()).insertAfter($(me.el).find('.pages')); + if ($('.logo-navbar').length > 0) { + $('.searchbar.document').css('margin-top', '27px'); + } + //$(me.el).find('.pages .page').first().prepend(_layout.find('#search-panel-view').html()); // Show replace mode if needed var isReplace = Common.SharedSettings.get('search-is-replace'); @@ -160,15 +164,10 @@ define([ $('.navbar-through .page > .searchbar').css('top', top); } - _.defer(function() { - uiApp.showNavbar(searchBar); - - searchBar.transitionEnd(function () { - if (!searchBar.hasClass('navbar-hidden')) { - $('.searchbar.search input').focus(); - } - }); - }, 10); + uiApp.showNavbar(searchBar); + if (!searchBar.hasClass('navbar-hidden')) { + $('.searchbar.search input').focus(); + } } }, @@ -182,14 +181,10 @@ define([ return; } - _.defer(function() { - searchBar.transitionEnd(function () { - me.fireEvent('searchbar:hide', me); - searchBar.remove(); - }); + me.fireEvent('searchbar:hide', me); + searchBar.remove(); + uiApp.hideNavbar(searchBar); - uiApp.hideNavbar(searchBar); - }, 10); } }, diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index a9b94ee4d..64b24a265 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -6616,7 +6616,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after display: none; } .searchbar.document { - background: #e4e4e6; + background-color: #f7f7f8; } i.icon.icon-logo { width: 100px; diff --git a/apps/documenteditor/mobile/resources/less/ios/_search.less b/apps/documenteditor/mobile/resources/less/ios/_search.less index 5d509e859..17697dc2f 100644 --- a/apps/documenteditor/mobile/resources/less/ios/_search.less +++ b/apps/documenteditor/mobile/resources/less/ios/_search.less @@ -117,5 +117,6 @@ } .searchbar.document { - background: lighten(@searchbarBg, 10%); + //background: lighten(@searchbarBg, 10%); + background-color: #f7f7f8; } \ No newline at end of file diff --git a/apps/presentationeditor/mobile/app/view/Search.js b/apps/presentationeditor/mobile/app/view/Search.js index b4443577e..ad2cd3931 100644 --- a/apps/presentationeditor/mobile/app/view/Search.js +++ b/apps/presentationeditor/mobile/app/view/Search.js @@ -144,7 +144,11 @@ define([ searchBar = $$('.searchbar.document'); if (searchBar.length < 1) { - $(me.el).find('.pages .page').first().prepend(_layout.find('#search-panel-view').html()); + $(_layout.find('#search-panel-view').html()).insertAfter($(me.el).find('.pages')); + if ($('.logo-navbar').length > 0) { + $('.searchbar.document').css('margin-top', '27px'); + } + //$(me.el).find('.pages .page').first().prepend(_layout.find('#search-panel-view').html()); // Show replace mode if needed var isReplace = Common.SharedSettings.get('search-is-replace'); @@ -160,15 +164,14 @@ define([ $('.navbar-through .page > .searchbar').css('top', top); } - _.defer(function() { - uiApp.showNavbar(searchBar); - searchBar.transitionEnd(function () { - if (!searchBar.hasClass('navbar-hidden')) { - $('.searchbar.search input').focus(); - } - }); - }, 10); + uiApp.showNavbar(searchBar); + + if (!searchBar.hasClass('navbar-hidden')) { + $('.searchbar.search input').focus(); + } + + } }, @@ -182,14 +185,10 @@ define([ return; } - _.defer(function() { - searchBar.transitionEnd(function () { - me.fireEvent('searchbar:hide', me); - searchBar.remove(); - }); + me.fireEvent('searchbar:hide', me); + searchBar.remove(); + uiApp.hideNavbar(searchBar); - uiApp.hideNavbar(searchBar); - }, 10); } }, diff --git a/apps/presentationeditor/mobile/resources/css/app-ios.css b/apps/presentationeditor/mobile/resources/css/app-ios.css index e726be221..57eb98982 100644 --- a/apps/presentationeditor/mobile/resources/css/app-ios.css +++ b/apps/presentationeditor/mobile/resources/css/app-ios.css @@ -6612,7 +6612,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after display: none; } .searchbar.document { - background: #e4e4e6; + background-color: #f7f7f8; } i.icon.icon-logo { width: 100px; diff --git a/apps/presentationeditor/mobile/resources/less/ios/_search.less b/apps/presentationeditor/mobile/resources/less/ios/_search.less index 389fd54c2..a6f69da4a 100644 --- a/apps/presentationeditor/mobile/resources/less/ios/_search.less +++ b/apps/presentationeditor/mobile/resources/less/ios/_search.less @@ -112,5 +112,6 @@ } .searchbar.document { - background: lighten(@searchbarBg, 10%); + //background: lighten(@searchbarBg, 10%); + background-color: #f7f7f8; } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/view/Search.js b/apps/spreadsheeteditor/mobile/app/view/Search.js index b0af5d351..7059da57c 100644 --- a/apps/spreadsheeteditor/mobile/app/view/Search.js +++ b/apps/spreadsheeteditor/mobile/app/view/Search.js @@ -145,7 +145,12 @@ define([ if (searchBar.length < 1) { - $(_layout.find('#search-panel-view').html()).insertAfter($(me.el).find('#cell-editing-box')); + $(_layout.find('#search-panel-view').html()).insertAfter($(me.el).find('.pages')); + if ($('.logo-navbar').length > 0) { + $('.searchbar.document').css('margin-top', '26px'); + } + //$(_layout.find('#search-panel-view').html()).insertAfter($(me.el).find('#cell-editing-box')); + // $(me.el).find('.pages .page').prepend(_layout.find('#search-panel-view').html()); // Show replace mode if needed @@ -175,15 +180,12 @@ define([ $('.navbar-through .page > .searchbar').css('top', top); } - _.defer(function() { uiApp.showNavbar(searchBar); - searchBar.transitionEnd(function () { - if (!searchBar.hasClass('navbar-hidden')) { - $('.searchbar.search input').focus(); - } - }); - }, 10); + if (!searchBar.hasClass('navbar-hidden')) { + $('.searchbar.search input').focus(); + } + } }, @@ -197,14 +199,9 @@ define([ return; } - _.defer(function() { - searchBar.transitionEnd(function () { - me.fireEvent('searchbar:hide', me); - searchBar.remove(); - }); - - uiApp.hideNavbar(searchBar); - }, 10); + me.fireEvent('searchbar:hide', me); + searchBar.remove(); + uiApp.hideNavbar(searchBar); } this.fireEvent('search:highlight', [this, false]); diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css index ff12e685b..db7713ff8 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css @@ -7416,7 +7416,7 @@ html.pixel-ratio-3 .box-tabs ul > li:after { display: none; } .searchbar.document { - background: #e4e4e6; + background-color: #f7f7f8; } .logo-navbar { height: 68px; diff --git a/apps/spreadsheeteditor/mobile/resources/less/ios/_search.less b/apps/spreadsheeteditor/mobile/resources/less/ios/_search.less index d3e5e0382..71dc716a3 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/ios/_search.less +++ b/apps/spreadsheeteditor/mobile/resources/less/ios/_search.less @@ -117,5 +117,6 @@ } .searchbar.document { - background: lighten(@searchbarBg, 10%); + //background: lighten(@searchbarBg, 10%); + background-color: #f7f7f8; } \ No newline at end of file