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

[gokaysatir (via logerrit)]

 loleaflet/css/loleaflet.css                |    4 ++--
 loleaflet/css/spreadsheet.css              |    8 +++-----
 loleaflet/src/control/Control.LokDialog.js |   25 +------------------------
 loleaflet/src/control/Control.Tabs.js      |    1 -
 4 files changed, 6 insertions(+), 32 deletions(-)

New commits:
commit e0a27002f0cd309b84e9cc573ff2c95d7c10f54e
Author:     gokaysatir <gokaysatir at collabora.com>
AuthorDate: Fri Jul 10 15:06:27 2020 +0300
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Thu Jul 16 00:19:50 2020 +0200

    loleaflet: sidebar overlap issue.
    
    Change-Id: Iff2184725c49c24900865d9865237e9747a050cb
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98555
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Henry Castro <hcastro at collabora.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 29ab4977c..97c47ab97 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -148,7 +148,7 @@ body {
 	position: absolute;
 	top: 77px;
 	right: 0px;
-	bottom: 37px;
+	bottom: 72px;
 	border-top: 1px solid #b6b6b6;
 	border-left: 1px solid #b6b6b6;
 	overflow: hidden;
@@ -162,7 +162,7 @@ body {
 	width: auto;
 	height: 100%;
 	overflow-x: hidden;
-	overflow-y: scroll;
+	overflow-y: auto;
 	z-index: 1200;
 }
 
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index 651dfb97b..3090872fb 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -2,7 +2,7 @@
 				border-top: 1px solid #B6B6B6;
 				top: 137px;
 				left: 50px;
-				bottom: 65px;
+				bottom: 75px;
 }
 
 #document-container.spreadsheet-document.readonly {
@@ -13,7 +13,7 @@
 	border-top: 1px solid #B6B6B6;
 	top: 100px;
 	left: 50px;
-	bottom: 68px;
+	bottom: 78px;
 }
 
 .spreadsheet-tabs-container {
@@ -36,14 +36,12 @@
 	height: 100%;
 	overflow: auto;
 	padding-bottom: 20px; /* to hide the horizontal scrollbar */
-	padding-right: 5px; /* to hide the vertical scrollbar */
-
 	margin-left: 6px;
 	}
 
 .spreadsheet-tab {
 	margin: 0px;
-	margin-top: 2px;
+	margin-top: 4px;
 	margin-right: 3px;
 	padding-left: 9px;
 	padding-right: 9px;
diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 9fd9dc7ff..f88e74e5e 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1595,7 +1595,7 @@ L.Control.LokDialog = L.Control.extend({
 			spreadsheetRowColumnFrame.style.right = width.toString() + 'px';
 
 		this._resizeCalcInputBar(deckOffset);
-		this._adjustTabsBar(width);
+
 		// If we didn't have the focus, don't steal it form the editor.
 		if ($('#' + this._currentDeck.strId + '-cursor').css('display') === 'none') {
 			if (this._map.editorHasFocus()) {
@@ -1623,29 +1623,6 @@ L.Control.LokDialog = L.Control.extend({
 		}
 	},
 
-	_adjustTabsBar: function(deckNewWidth) {
-
-		if (this._map.getDocType() !== 'spreadsheet') {
-			return;
-		}
-
-		// This is called only if sidebar is made visible or hidden, so no need of
-		// special-casing for mobile where that never happens.
-		// In the case of tablets, when sidebar is made visible/hidden the below adjustments
-		// will work correctly like in desktop-online (verified with chrome-tablet emulator).
-
-		var tabsContainer = L.DomUtil.get('spreadsheet-tabs-container-id');
-		if (!tabsContainer) {
-			return;
-		}
-
-		var docWidth = L.DomUtil.get('spreadsheet-toolbar').getBoundingClientRect().width;
-		var tabsContainerLeft = tabsContainer.getBoundingClientRect().left;
-		var deckMargin = (deckNewWidth === 0) ? 0 : 10;
-
-		tabsContainer.style.width = (docWidth - tabsContainerLeft - deckNewWidth - deckMargin) + 'px';
-	},
-
 	_onDialogChildClose: function(dialogId) {
 		$('#' + this._toStrId(dialogId) + '-floating').remove();
 		if (!this._isSidebar(dialogId) && !this.isCalcInputBar(dialogId)) {
diff --git a/loleaflet/src/control/Control.Tabs.js b/loleaflet/src/control/Control.Tabs.js
index 7bb681364..06ccd043a 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -42,7 +42,6 @@ L.Control.Tabs = L.Control.extend({
 		var map = this._map;
 		var docContainer = map.options.documentContainer;
 		this._tabsCont = L.DomUtil.create('div', 'spreadsheet-tabs-container', docContainer.parentElement);
-		this._tabsCont.id = 'spreadsheet-tabs-container-id';
 
 		this._menuItem = {
 			'insertsheetbefore': {name: _('Insert sheet before this'),