[Libreoffice-commits] online.git: 2 commits - loleaflet/css loleaflet/src

[Jan Holesovsky (via logerrit)]

 loleaflet/css/device-tablet.css          |    5 +++++
 loleaflet/src/control/Control.Toolbar.js |   16 ----------------
 2 files changed, 5 insertions(+), 16 deletions(-)

New commits:
commit 0f96ad6569cab0d38b499d7545df86328ea298e9
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Apr 3 17:21:55 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Apr 6 12:06:55 2020 +0200

    tablet: Avoid gap between menu and the upper toolbar.
    
    Change-Id: I25845dbe6ddae8f35885b94a9d01902f3a4daa9c
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91649
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/css/device-tablet.css b/loleaflet/css/device-tablet.css
index edce0c297..519300405 100644
--- a/loleaflet/css/device-tablet.css
+++ b/loleaflet/css/device-tablet.css
@@ -30,3 +30,8 @@
 	-o-transform: rotate(180deg);
 	transform: rotate(180deg);
 }
+
+/* Additions for the main menu. */
+.main-nav {
+    margin: 0;
+}
commit 7d358823bbca56b2fffdaf4ac2314fd98bde0120
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Apr 3 17:17:34 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Apr 6 12:06:45 2020 +0200

    tablet: Show the menu by default as on iPad.
    
    Change-Id: I382de5784ba24e4e6409e743cbf586f691637815
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91648
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index f6606bdd5..6a61894df 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1742,22 +1742,6 @@ function onDocLayerInit() {
 					     );
 	}
 
-	if (!window.ThisIsTheiOSApp && window.mode.isTablet()) {
-		// Fold menubar by default
-		// FIXME: reuse toogleMenubar / use css
-		$('.main-nav').css({'display': 'none'});
-		$('#closebuttonwrapper').css({'display': 'none'});
-		var obj = $('.fold');
-		obj.removeClass('w2ui-icon fold');
-		obj.addClass('w2ui-icon unfold');
-		$(map.options.documentContainer).addClass('tablet');
-		$('#spreadsheet-row-column-frame').addClass('tablet');
-		$('#presentation-controls-wrapper').css({'top': '36px'});
-
-		$('#tb_editbar_item_fonts').css({'display': 'none'});
-		$('#tb_editbar_item_fontsizes').css({'display': 'none'});
-	}
-
 	if (docType == 'spreadsheet') {
 		var el = w2ui['spreadsheet-toolbar'];
 		if (el)