diff --git a/apps/common/mobile/resources/less/ios/_container.less b/apps/common/mobile/resources/less/ios/_container.less index 351516934..a51aa98e8 100644 --- a/apps/common/mobile/resources/less/ios/_container.less +++ b/apps/common/mobile/resources/less/ios/_container.less @@ -6,10 +6,8 @@ } .page-content { - .list-block, .content-block { - &:first-child { - margin-top: -1px; - } + .list-block:first-child { + margin-top: -1px; } } } @@ -69,6 +67,15 @@ border-radius: 13px; } } + + .content-block:first-child { + margin-top: 0; + .content-block-inner { + &:before { + height: 0; + } + } + } } .categories { diff --git a/apps/spreadsheeteditor/mobile/app-dev.js b/apps/spreadsheeteditor/mobile/app-dev.js index 056736891..1f22c48bd 100644 --- a/apps/spreadsheeteditor/mobile/app-dev.js +++ b/apps/spreadsheeteditor/mobile/app-dev.js @@ -117,9 +117,9 @@ require([ 'Editor', 'Toolbar', 'Search', + 'CellEditor', 'Main', 'DocumentHolder' - ,'CellEditor' ,'Statusbar' ,'Settings' ,'EditContainer' diff --git a/apps/spreadsheeteditor/mobile/app/template/AddFunction.template b/apps/spreadsheeteditor/mobile/app/template/AddFunction.template index c12dc2d02..adca72132 100644 --- a/apps/spreadsheeteditor/mobile/app/template/AddFunction.template +++ b/apps/spreadsheeteditor/mobile/app/template/AddFunction.template @@ -83,7 +83,7 @@
-
+

<%= args %>

<%= descr %>

diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js b/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js index c29e5aaa2..45d702028 100644 --- a/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js +++ b/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js @@ -86,7 +86,7 @@ define([ var me = this; $('.settings').single('click', '.function .info', this.onFunctionInfoClick.bind(this)) - .single('click', '.function > a', this.onFunctionClick.bind(this)); + .on('click', '.function > a', this.onFunctionClick.bind(this)); $('.groups a.group').single('click', this.onGroupClick.bind(this)); me.initControls(); @@ -142,8 +142,8 @@ define([ }, onFunctionClick: function (e) { - if ( !/\.info/.test(e.target) ) - this.fireEvent('function:insert', [$(e.target).data('func')]); + // if ( !/info/.test(e.target.className) ) + this.fireEvent('function:insert', [$(e.currentTarget).data('func')]); }, onFunctionInfoClick: function(e) {