loleaflet/css/toolbar.css | 1 -
loleaflet/src/control/Control.Toolbar.js | 20 +++++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 06bbdd2c75fa320a5550347b5ef385598a42dc93
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Tue Oct 8 10:22:59 2019 -0400
Commit: Henry Castro <hcas...@collabora.com>
CommitDate: Tue Oct 8 16:51:58 2019 +0200
loleaflet: mobile: avoid to set twice the same toolbar item
ImpressTileLayer has its own toolbar that it was created
with items 'prev' and 'next'. When update parts event is
triggered it is not necessary to set it again. The code is
valid only for Desktop view.
Change-Id: I51345a824079565bb9b8d2feae7c71624bbe4841
Reviewed-on: https://gerrit.libreoffice.org/80476
Reviewed-by: Henry Castro <hcas...@collabora.com>
Tested-by: Henry Castro <hcas...@collabora.com>
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index d2543bc4e..728064b4a 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1956,15 +1956,17 @@ function onUpdateParts(e) {
return;
}
- if (e.docType === 'presentation') {
- toolbar.set('prev', {hint: _('Previous slide')});
- toolbar.set('next', {hint: _('Next slide')});
- }
- else {
- toolbar.hide('presentation');
- toolbar.hide('insertpage');
- toolbar.hide('duplicatepage');
- toolbar.hide('deletepage');
+ if (!window.mode.isMobile()) {
+ if (e.docType === 'presentation') {
+ toolbar.set('prev', {hint: _('Previous slide')});
+ toolbar.set('next', {hint: _('Next slide')});
+ }
+ else {
+ toolbar.hide('presentation');
+ toolbar.hide('insertpage');
+ toolbar.hide('duplicatepage');
+ toolbar.hide('deletepage');
+ }
}
if (e.docType !== 'spreadsheet') {
commit 7a6517634148ca61616d6ecd8dda1b50a673f68b
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Oct 8 16:50:57 2019 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Oct 8 16:50:57 2019 +0200
jsdialogs: no white text in tabs
Change-Id: I998a21f9e0f4407784f72915d5a2f187f86ed76b
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index c1f4d2110..bbea39096 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -1053,7 +1053,6 @@ menu-entry-with-icon.padding-left + menu-entry-icon.width
*/
}
.ui-tab.selected.mobile-wizard {
- color: white;
background-color: #eaf5ff;
border: none;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
