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 13445521016e3c274843b7d2a1dd0b72202eec05 Author: gokaysatir <[email protected]> AuthorDate: Fri Jul 10 15:06:27 2020 +0300 Commit: Andras Timar <[email protected]> CommitDate: Wed Aug 26 11:46: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 <[email protected]> Tested-by: Henry Castro <[email protected]> Reviewed-by: Henry Castro <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101383 Reviewed-by: Andras Timar <[email protected]> diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css index 57ec51d9e..e60639b08 100644 --- a/loleaflet/css/loleaflet.css +++ b/loleaflet/css/loleaflet.css @@ -158,7 +158,7 @@ body { position: absolute; top: 77px; right: 0px; - bottom: 37px; + bottom: 72px; border-top: 1px solid #b6b6b6; border-left: 1px solid #b6b6b6; overflow: hidden; @@ -172,7 +172,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 1934933b5..6111444a7 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 b46fa91c4..4228f46d7 100644 --- a/loleaflet/src/control/Control.LokDialog.js +++ b/loleaflet/src/control/Control.LokDialog.js @@ -1628,7 +1628,7 @@ L.Control.LokDialog = L.Control.extend({ spreadsheetRowColumnFrame.style.right = width.toString() + 'px'; this._resizeCalcInputBar(deckOffset); - this._adjustTabsBar(width); + }, _resizeCalcInputBar: function(offset) { @@ -1649,29 +1649,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'), _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
