From 4e61dc351c2d893b66a68ca8995d4e45397eeda7 Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Wed, 23 Nov 2016 14:00:41 +0300 Subject: [PATCH] [DE mobile] Fixed display document area. --- apps/documenteditor/mobile/app/view/Toolbar.js | 10 ++++++++-- apps/documenteditor/mobile/resources/css/app-ios.css | 7 ++++++- .../mobile/resources/css/app-material.css | 7 ++++++- apps/documenteditor/mobile/resources/less/app-ios.less | 7 ++++++- .../mobile/resources/less/app-material.less | 7 ++++++- 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/mobile/app/view/Toolbar.js b/apps/documenteditor/mobile/app/view/Toolbar.js index 5b489f4f2..527e7ce7b 100644 --- a/apps/documenteditor/mobile/app/view/Toolbar.js +++ b/apps/documenteditor/mobile/app/view/Toolbar.js @@ -105,8 +105,14 @@ define([ }, onDisplayMainNavbar: function (e) { - var $target = $(e.currentTarget); - $('#editor_sdk').css('marginTop', $target.hasClass('navbar-hidden') ? 0 : ''); + var $target = $(e.currentTarget), + navbarHidden = $target.hasClass('navbar-hidden'), + pickerHeight = $('.picker-modal').height() || 260; + + $('#editor_sdk').css({ + top : navbarHidden ? 0 : '', + bottom : navbarHidden ? pickerHeight : '' + }); }, // Search diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index d73bebdfa..1922b10f3 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -6507,7 +6507,12 @@ i.icon.icon-link { background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20viewBox%3D%220%200%2022%2022%22%20fill%3D%22%234066D7%22%3E%3Cg%3E%3Cpath%20d%3D%22M12.4%2C9.8c0%2C0-2.1-0.1-3.8%2C1.2c-2.8%2C2-3.3%2C4.3-3.3%2C4.3s1.6-1.7%2C3.5-2.5c1.7-0.7%2C3.7-0.4%2C3.7-0.4v1.9l4.8-3.3V11l-4.8-3.3V9.8z%20M11%2C1C5.5%2C1%2C1%2C5.5%2C1%2C11c0%2C5.5%2C4.5%2C10%2C10%2C10s10-4.5%2C10-10C21%2C5.5%2C16.5%2C1%2C11%2C1z%20M11%2C20c-5%2C0-9-4.1-9-9C2%2C6%2C6%2C2%2C11%2C2s9%2C4.1%2C9%2C9C20%2C16%2C16%2C20%2C11%2C20z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } #editor_sdk { - margin-top: 44px; + position: absolute; + left: 0; + right: 0; + top: 44px; + bottom: 0; + height: auto; -webkit-transition-duration: 300ms; transition-duration: 300ms; } diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 97d235724..455409dc2 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -6105,7 +6105,12 @@ textarea { user-select: text; } #editor_sdk { - margin-top: 48px; + position: absolute; + left: 0; + right: 0; + top: 48px; + bottom: 0; + height: auto; -webkit-transition-duration: 300ms; transition-duration: 300ms; } diff --git a/apps/documenteditor/mobile/resources/less/app-ios.less b/apps/documenteditor/mobile/resources/less/app-ios.less index bc6d194ac..b0306bf55 100644 --- a/apps/documenteditor/mobile/resources/less/app-ios.less +++ b/apps/documenteditor/mobile/resources/less/app-ios.less @@ -78,7 +78,12 @@ input, textarea { // Top offset #editor_sdk { - margin-top: @toolbarSize; + position: absolute; + left: 0; + right: 0; + top: @toolbarSize; + bottom: 0; + height: auto; .transition(300ms); } diff --git a/apps/documenteditor/mobile/resources/less/app-material.less b/apps/documenteditor/mobile/resources/less/app-material.less index 7e54705fb..4d89f571a 100644 --- a/apps/documenteditor/mobile/resources/less/app-material.less +++ b/apps/documenteditor/mobile/resources/less/app-material.less @@ -71,7 +71,12 @@ input, textarea { // Top offset #editor_sdk { - margin-top: @toolbarSize; + position: absolute; + left: 0; + right: 0; + top: @toolbarSize; + bottom: 0; + height: auto; .transition(300ms); }