[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
Pedro (via logerrit)
logerrit at kemper.freedesktop.org
Thu Oct 24 13:42:25 UTC 2019
loleaflet/css/mobilewizard.css | 9 +++++++--
loleaflet/images/lc_clearoutline.svg | 1 +
loleaflet/images/lc_hidedetail.svg | 10 ++++++++++
loleaflet/images/lc_showdetail.svg | 10 ++++++++++
loleaflet/src/control/Control.JSDialogBuilder.js | 2 +-
5 files changed, 29 insertions(+), 3 deletions(-)
New commits:
commit 79a0dcc9ff30f00b9b51e7903fd17840c5d1f9d6
Author: Pedro <pedro.silva at collabora.com>
AuthorDate: Thu Oct 24 15:00:42 2019 +0200
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Oct 24 15:42:06 2019 +0200
Hamburger menu: add missing icons, add default placeholder, add parent class in JS
Change-Id: I61d4127f1ddcf1e08b61cc7d6a76e47a80ba49f7
Reviewed-on: https://gerrit.libreoffice.org/81452
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
Tested-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 0ce1e3afe..0ed0cc2af 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -35,10 +35,15 @@ span#main-menu-btn-icon {
#leadingzeroes .spinfieldimage, #decimalplaces .spinfieldimage{
display: none;
}
-.ui-header.level-1.mobile-wizard.ui-widget img[src^="images/lc_downloadas-doc"], .ui-header.level-1.mobile-wizard.ui-widget img[src^="images/lc_downloadas-pp"],.ui-header.level-1.mobile-wizard.ui-widget img[src^="images/lc_downloadas-xls"], .ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_showdetail.svg"], .ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_hidedetail.svg"], .ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_clearoutline.svg"], .ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_deleterowbreak.svg"], .ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_deletecolumnbreak.svg"]{
+.ui-header.level-1.mobile-wizard.ui-widget img[src^='images/lc_downloadas-doc'], .ui-header.level-1.mobile-wizard.ui-widget img[src^='images/lc_downloadas-pp'],.ui-header.level-1.mobile-wizard.ui-widget img[src^='images/lc_downloadas-xls'], .ui-header.level-2.mobile-wizard.ui-widget img[src='images/lc_deleterowbreak.svg'], .ui-header.level-2.mobile-wizard.ui-widget img[src='images/lc_deletecolumnbreak.svg']{
visibility: hidden;
}
-.ui-header.level-1.mobile-wizard.ui-widget img[src="images/lc_downloadas-pdf.svg"]{
+.menu-entry-icon.deleterowbreak, .menu-entry-icon.deletecolumnbreak, .menu-entry-icon.downloadas-xls, .menu-entry-icon.downloadas-xlsx, .menu-entry-icon.downloadas-doc, .menu-entry-icon.downloadas-docx, .menu-entry-icon.downloadas-ppt, .menu-entry-icon.downloadas-pptx{
+ background-color: #eeeeee;
+ border-radius: 100px;
+ box-shadow: inset 0 0px 0 8px white;
+}
+.ui-header.level-1.mobile-wizard.ui-widget img[src='images/lc_downloadas-pdf.svg']{
visibility: visible;
}
diff --git a/loleaflet/images/lc_clearoutline.svg b/loleaflet/images/lc_clearoutline.svg
new file mode 100644
index 000000000..a4c65dde9
--- /dev/null
+++ b/loleaflet/images/lc_clearoutline.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#e68497" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m4 20 16-16"/><path d="m20 20-16-15.9999998"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_hidedetail.svg b/loleaflet/images/lc_hidedetail.svg
new file mode 100644
index 000000000..49c03cf44
--- /dev/null
+++ b/loleaflet/images/lc_hidedetail.svg
@@ -0,0 +1,10 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path
+ style="fill:#808080"
+ d="M 10.5,2 C 10.223,2 10,2.223 10,2.5 10,2.777 10.223,3 10.5,3 h 10 C 20.777,3 21,2.777 21,2.5 21,2.223 20.777,2 20.5,2 Z m 0,3 C 10.223,5 10,5.223 10,5.5 10,5.777 10.223,6 10.5,6 h 10 C 20.777,6 21,5.777 21,5.5 21,5.223 20.777,5 20.5,5 Z m 2,5 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 h 8 C 20.777,11 21,10.777 21,10.5 21,10.223 20.777,10 20.5,10 Z m 0,3 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 h 8 C 20.777,14 21,13.777 21,13.5 21,13.223 20.777,13 20.5,13 Z m -2,5 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 h 10 C 20.777,19 21,18.777 21,18.5 21,18.223 20.777,18 20.5,18 Z m 0,3 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 h 10 C 20.777,22 21,21.777 21,21.5 21,21.223 20.777,21 20.5,21 Z"
+ />
+ <path
+ style="fill:#e68497"
+ d="m 2,11 h 8 v 2 H 2 Z"
+ />
+</svg>
diff --git a/loleaflet/images/lc_showdetail.svg b/loleaflet/images/lc_showdetail.svg
new file mode 100644
index 000000000..8ae2992ab
--- /dev/null
+++ b/loleaflet/images/lc_showdetail.svg
@@ -0,0 +1,10 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path
+ style="fill:#808080"
+ d="M 10.5 2 C 10.223 2 10 2.223 10 2.5 C 10 2.777 10.223 3 10.5 3 L 20.5 3 C 20.777 3 21 2.777 21 2.5 C 21 2.223 20.777 2 20.5 2 L 10.5 2 z M 10.5 5 C 10.223 5 10 5.223 10 5.5 C 10 5.777 10.223 6 10.5 6 L 20.5 6 C 20.777 6 21 5.777 21 5.5 C 21 5.223 20.777 5 20.5 5 L 10.5 5 z M 12.5 10 C 12.223 10 12 10.223 12 10.5 C 12 10.777 12.223 11 12.5 11 L 20.5 11 C 20.777 11 21 10.777 21 10.5 C 21 10.223 20.777 10 20.5 10 L 12.5 10 z M 12.5 13 C 12.223 13 12 13.223 12 13.5 C 12 13.777 12.223 14 12.5 14 L 20.5 14 C 20.777 14 21 13.777 21 13.5 C 21 13.223 20.777 13 20.5 13 L 12.5 13 z M 10.5 18 C 10.223 18 10 18.223 10 18.5 C 10 18.777 10.223 19 10.5 19 L 20.5 19 C 20.777 19 21 18.777 21 18.5 C 21 18.223 20.777 18 20.5 18 L 10.5 18 z M 10.5 21 C 10.223 21 10 21.223 10 21.5 C 10 21.777 10.223 22 10.5 22 L 20.5 22 C 20.777 22 21 21.777 21 21.5 C 21 21.223 20.777 21 20.5 21 L 10.5 21 z "
+ />
+ <path
+ style="fill:#76a797"
+ d="m 5,8 v 3 H 2 v 2 h 3 v 3 h 2 v -3 h 3 V 11 H 7 V 8 Z"
+ />
+</svg>
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index 0028a3380..7ac9f9a41 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -794,7 +794,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
var icon = null;
var commandName = data.command ? data.command.substring('.uno:'.length) : data.id;
if (commandName && commandName.length && L.LOUtil.existsIconForCommand(commandName)) {
- var iconSpan = L.DomUtil.create('span', 'menu-entry-icon', menuEntry);
+ var iconSpan = L.DomUtil.create('span', 'menu-entry-icon ' + commandName.toLowerCase(), menuEntry);
var iconPath = 'images/lc_' + commandName.toLowerCase() + '.svg';
icon = L.DomUtil.create('img', '', iconSpan);
icon.src = iconPath;
More information about the Libreoffice-commits
mailing list