commit db2ae7432ddc432e42811bb125bd0d5a39a4087e
author Aron Budea <aron.budea@collabora.com> Tue Jan 28 02:21:29 2020 +0100
committer Jan Holesovsky <kendy@collabora.com> Tue Jan 28 18:44:26 2020 +0100
tree d408bd44e3841ca70736233a809dee0f357f4a5d
parent 7c1153d30a96320a72ddb7de96f0011e7058be32

tdf#130223: Revert "Some menubar folding/unfolding cleanups"

This reverts commit 2f861612e9aac7e92722597f345a6ab4f4e00d02,
which caused the formula bar to be hidden, and rows to get
misaligned on tablets.

Change-Id: I14826fccb23283e3f7462eee7aeb43fb6d2eaeaa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87568
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>

loleaflet/src/control/Control.Toolbar.js

diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index 8bb1e3e..80c4bd5 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1714,10 +1714,16 @@
	}

	if (!window.ThisIsTheiOSApp && window.mode.isTablet()) {
		map.hideMenubar();

		// 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': '41px'});

		$('#tb_editbar_item_fonts').css({'display': 'none'});
		$('#tb_editbar_item_fontsizes').css({'display': 'none'});

loleaflet/src/map/Map.js

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 45ab927..4ee7755 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1687,8 +1687,8 @@
		}

		var obj = $('.unfold');
		obj.removeClass('unfold');
		obj.addClass('fold');
		obj.removeClass('w2ui-icon unfold');
		obj.addClass('w2ui-icon fold');

		moveObjectVertically($('#spreadsheet-row-column-frame'), 36);
		moveObjectVertically($(this.options.documentContainer), 36);
@@ -1705,8 +1705,8 @@
		}

		var obj = $('.fold');
		obj.removeClass('fold');
		obj.addClass('unfold');
		obj.removeClass('w2ui-icon fold');
		obj.addClass('w2ui-icon unfold');

		moveObjectVertically($('#spreadsheet-row-column-frame'), -36);
		moveObjectVertically($(this.options.documentContainer), -36);