From cc4addb2ff853ef4fabcb46fcbff0d4c1300357b Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 5 Dec 2016 19:44:34 +0300 Subject: [PATCH] [SSE mobile] 'search' opened under expanded 'celleditor' --- apps/spreadsheeteditor/mobile/app/view/CellEditor.js | 5 +++-- .../mobile/resources/less/celleditor.less | 1 + .../mobile/resources/less/ios/_search.less | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/app/view/CellEditor.js b/apps/spreadsheeteditor/mobile/app/view/CellEditor.js index 478f627f90..8790eb0fa6 100644 --- a/apps/spreadsheeteditor/mobile/app/view/CellEditor.js +++ b/apps/spreadsheeteditor/mobile/app/view/CellEditor.js @@ -81,10 +81,11 @@ define([ expandEditor: function() { if (this.$el.height() > this.defEditorHeight) { - this.$el.height(this.defEditorHeight); + this.$el.height(this.defEditorHeight).removeClass('expanded'); this.$btnexpand.removeClass('collapse'); } else { - this.$el.height(this.maxEditorHeight); + out_height = this.maxEditorHeight; + this.$el.height(this.maxEditorHeight).addClass('expanded'); this.$btnexpand.addClass('collapse'); } diff --git a/apps/spreadsheeteditor/mobile/resources/less/celleditor.less b/apps/spreadsheeteditor/mobile/resources/less/celleditor.less index 7272b6c1cc..ec04d64a40 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/celleditor.less +++ b/apps/spreadsheeteditor/mobile/resources/less/celleditor.less @@ -3,6 +3,7 @@ @gray-light: #f1f1f1; //rgb(241, 241, 241) @cellEditorHeight: 30px; +@cellEditorHeightExp: 70px; .border-radius(@radius: 2px) { border-radius: @radius; diff --git a/apps/spreadsheeteditor/mobile/resources/less/ios/_search.less b/apps/spreadsheeteditor/mobile/resources/less/ios/_search.less index e396e08a15..fa91c4f769 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/ios/_search.less +++ b/apps/spreadsheeteditor/mobile/resources/less/ios/_search.less @@ -1,8 +1,14 @@ // Search -.navbar-through .page > .searchbar { - top: @toolbarSize + @cellEditorHeight; - //position: relative; +.navbar-through .page { + & > .searchbar { + top: @toolbarSize + @cellEditorHeight; + //position: relative; + } + + #cell-editing-box.expanded + .searchbar { + top: @toolbarSize + @cellEditorHeightExp; + } } .tablet {