loleaflet/css/toolbar.css | 2 +- loleaflet/js/toolbar.js | 8 +++----- loleaflet/src/control/Control.Tabs.js | 9 +++++++++ 3 files changed, 13 insertions(+), 6 deletions(-)
New commits: commit c984e6c321b1ea1643fd8a817815f1cef0ddf9c0 Author: Szymon Kłos <[email protected]> AuthorDate: Fri Dec 7 16:36:16 2018 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Fri Dec 7 21:52:40 2018 +0100 Make the toolbar white Change-Id: I9bcec2ed9c162b84f3f53f9abbeb3616ed1c35c9 diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css index 228623b3b..53d5b7490 100644 --- a/loleaflet/css/toolbar.css +++ b/loleaflet/css/toolbar.css @@ -5,7 +5,7 @@ text-align: center; z-index: 999; overflow: visible !important; - background-color: transparent; + background-color: white; } #toolbar-down { commit b4baf6d82ce868db9f7ab72e241f1c119e5fdfcf Author: Szymon Kłos <[email protected]> AuthorDate: Fri Dec 7 15:11:23 2018 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Fri Dec 7 21:51:45 2018 +0100 Show sheets toolbar in readonly mode Change-Id: Iac6390d7cb5186ca9538cd3ed9d7c896aa9c8f81 diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js index d5cd95051..1c666be88 100644 --- a/loleaflet/js/toolbar.js +++ b/loleaflet/js/toolbar.js @@ -2123,7 +2123,7 @@ function onUpdatePermission(e) { } } - var spreadsheetButtons = ['firstrecord', 'prevrecord', 'nextrecord', 'lastrecord', 'insertsheet']; + var spreadsheetButtons = ['insertsheet']; var formulaBarButtons = ['sum', 'function']; var presentationButtons = ['insertpage', 'duplicatepage', 'deletepage']; var toolbarDownButtons = ['next', 'prev']; @@ -2167,7 +2167,6 @@ function onUpdatePermission(e) { case 'spreadsheet': $('#document-container').css('bottom', '68px'); // FIXME this and spreadsheet-row-column-frame are supposed to be the same, but are not $('#spreadsheet-row-column-frame').css('bottom', '65px'); - $('#spreadsheet-tabs-container').show(); $('#spreadsheet-toolbar').show(); break; case 'presentation': @@ -2215,10 +2214,9 @@ function onUpdatePermission(e) { $('#document-container').css('bottom', '0'); break; case 'spreadsheet': - $('#document-container').css('bottom', '0'); + $('#document-container').css('bottom', '35px'); $('#spreadsheet-row-column-frame').css('bottom', '0'); - $('#spreadsheet-tabs-container').hide(); - $('#spreadsheet-toolbar').hide(); + $('#spreadsheet-toolbar').show(); break; case 'presentation': $('#document-container').css('bottom', '0'); diff --git a/loleaflet/src/control/Control.Tabs.js b/loleaflet/src/control/Control.Tabs.js index 0d7a3a3d5..6c9b8ae73 100644 --- a/loleaflet/src/control/Control.Tabs.js +++ b/loleaflet/src/control/Control.Tabs.js @@ -21,6 +21,15 @@ L.Control.Tabs = L.Control.extend({ setTimeout(function() { $('.spreadsheet-tab').contextMenu(e.perm === 'edit'); }, 1000); + + if (e.perm === 'edit') { + $('.spreadsheet-tabs-container').css('bottom', '33px'); + $('#spreadsheet-toolbar').css('bottom', '33px'); + } + else { + $('.spreadsheet-tabs-container').css('bottom', '0px'); + $('#spreadsheet-toolbar').css('bottom', '0px'); + } }, _initialize: function () { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
