[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
Pedro Pinto Silva (via logerrit)
logerrit at kemper.freedesktop.org
Mon Mar 16 11:22:22 UTC 2020
loleaflet/css/mobilewizard.css | 9 +--------
loleaflet/images/lc_delbreakmenu.svg | 10 ++++++++++
loleaflet/images/lc_deletecolumnbreak.svg | 9 +++++++++
loleaflet/images/lc_deleterowbreak.svg | 10 ++++++++++
loleaflet/images/lc_groupoutlinemenu.svg | 1 +
loleaflet/images/lc_insertbreakmenu.svg | 1 +
loleaflet/images/lc_insertcolumnsmenu.svg | 1 +
loleaflet/images/lc_insertrowbreak.svg | 11 ++++++++++-
loleaflet/images/lc_insertrowsmenu.svg | 1 +
loleaflet/src/control/Control.Menubar.js | 10 +++++-----
10 files changed, 49 insertions(+), 14 deletions(-)
New commits:
commit 7918f69a2452045e2e88639947d05278e4aa7028
Author: Pedro Pinto Silva <pedro.silva at collabora.com>
AuthorDate: Mon Mar 16 11:18:41 2020 +0100
Commit: Pedro Pinto da Silva <pedro.silva at collabora.com>
CommitDate: Mon Mar 16 12:22:00 2020 +0100
Mobile: Calc: Hamburger menu: sheet and submenus: add icons
- Remove default gray elements for submenus
- Fix some icon sizes from 32 pc to 24 px
- Add new delete icons
- Add icon for data > group outline etc
Change-Id: I62e234d995fc6e875c5344715661dfd3202ef6a6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90557
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Tested-by: Pedro Pinto da Silva <pedro.silva at collabora.com>
Reviewed-by: Pedro Pinto da Silva <pedro.silva at collabora.com>
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 00a109811..897879943 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -43,14 +43,7 @@
#leadingzeroes .spinfieldimage, #decimalplaces .spinfieldimage, .menu-entry-icon.setanchoratchar, .menu-entry-icon.setanchortochar, .menu-entry-icon.setanchortopage, .menu-entry-icon.setanchortocellresize, .menu-entry-icon.setanchortocell{
display: none;
}
- .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;
- }
- .menu-entry-icon.deleterowbreak, .menu-entry-icon.deletecolumnbreak{
- 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_delbreakmenu.svg b/loleaflet/images/lc_delbreakmenu.svg
new file mode 100644
index 000000000..b6753cbdc
--- /dev/null
+++ b/loleaflet/images/lc_delbreakmenu.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.5 1.9746v5.9414c0 0.554 0.446 1 1 1h6.9551a1.0949 1.0949 0 0 1 0.33594-0.90234l0.10352-0.097656h-7.3945v-5.9414h-1zm16 0v4.584l0.59375-0.60938a1.0949 1.0949 0 0 1 0.40625-0.26172v-3.7129h-1zm-2.0078 5.9414 0.3457 0.34766 0.33789-0.34766h-0.68359z" fill="#808080"/>
+ <g transform="matrix(.77119 0 0 .77119 -1.0816 -.33899)" fill="#4d82b8">
+ <path d="m2.6224 12c-0.34413 0.0015-0.62238 0.29942-0.62241 0.66647v6.6647c-7.76e-4 0.56568 0.61783 0.87517 1.0251 0.51287l3.7491-3.3324c0.30104-0.26653 0.30104-0.75922 0-1.0257l-3.7491-3.3324c-0.11312-0.10013-0.25573-0.15452-0.40273-0.1536z"/>
+ <rect x="8" y="15" width="6" height="2" ry=".9661"/>
+ <path d="m16.967 15c-0.53522 0-0.9668 0.43158-0.9668 0.9668v0.06641c0 0.53522 0.43158 0.9668 0.9668 0.9668h1.5527l1.0176-1.0273-0.94726-0.97266h-1.623z"/>
+ </g>
+ <path d="m4.5 15.084c-0.554 0-1 0.446-1 1v5.9414h1v-5.9414h7.4746l-0.19922-0.19531a1.0949 1.0949 0 0 1-0.32422-0.80469h-6.9512zm13.344 0.5293-0.44531 0.4707h0.89258l-0.44727-0.4707zm1.6562 1.7461v4.666h1v-3.7363a1.0949 1.0949 0 0 1-0.35547-0.25l-0.64453-0.67969z" fill="#808080"/>
+ <path d="m23.539 15.289-3.2343-3.291 3.1121-3.4476-2.2435-2.1355-3.2028 3.2854-3.2678-3.2854-2.3342 2.2141 3.2678 3.355-3.2678 3.3015 2.3342 2.2998 3.264-3.4497 3.2715 3.4497z" fill="#e68497" stroke-width=".77119"/>
+</svg>
diff --git a/loleaflet/images/lc_deletecolumnbreak.svg b/loleaflet/images/lc_deletecolumnbreak.svg
new file mode 100644
index 000000000..59ffdd0f2
--- /dev/null
+++ b/loleaflet/images/lc_deletecolumnbreak.svg
@@ -0,0 +1,9 @@
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 3v18h15v-18z" fill="#fff"/>
+ <path d="m5 2c-0.554 0-1 0.446-1 1v18c0 0.554 0.446 1 1 1h15c0.554 0 1-0.446 1-1v-18c0-0.554-0.446-1-1-1zm0 1h15v18h-15zm1.5 2c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h4c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5zm0 4c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h4c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5zm8 0c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h4c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5zm-8 3c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h4c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5zm8 0c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h4c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5zm-8 3c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h4c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5zm8 0c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h4c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5zm0 3c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h4c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5z" fill="#808080"/>
+ <path d="m12.5 5c-0.277 0-0.5 0.223-0.5 0.5v12.5h-3.6016c-0.22066 0-0.39844 0.17778-0.39844 0.39844v0.20312c0 0.22066 0.17778 0.39844 0.39844 0.39844h4.1016 0.10156c0.22066 0 0.39844-0.17778 0.39844-0.39844v-0.10156-0.10156-12.398h3.5c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-4z" fill="#4d82b8"/>
+ <g transform="matrix(.63939 0 0 .63939 5.178 4.3256)">
+ <path d="m18.694 16.267-4.1939-4.2674 4.0355-4.4705-2.9091-2.7691-4.1531 4.2602-4.2373-4.2602-3.0267 2.871 4.2373 4.3505-4.2373 4.281 3.0267 2.9821 4.2324-4.4732 4.2422 4.4732z" fill="#fff" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/>
+ <path d="m18.694 16.267-4.1939-4.2674 4.0355-4.4705-2.9091-2.7691-4.1531 4.2602-4.2373-4.2602-3.0267 2.871 4.2373 4.3505-4.2373 4.281 3.0267 2.9821 4.2324-4.4732 4.2422 4.4732z" fill="#e68497"/>
+ </g>
+</svg>
diff --git a/loleaflet/images/lc_deleterowbreak.svg b/loleaflet/images/lc_deleterowbreak.svg
new file mode 100644
index 000000000..b6753cbdc
--- /dev/null
+++ b/loleaflet/images/lc_deleterowbreak.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.5 1.9746v5.9414c0 0.554 0.446 1 1 1h6.9551a1.0949 1.0949 0 0 1 0.33594-0.90234l0.10352-0.097656h-7.3945v-5.9414h-1zm16 0v4.584l0.59375-0.60938a1.0949 1.0949 0 0 1 0.40625-0.26172v-3.7129h-1zm-2.0078 5.9414 0.3457 0.34766 0.33789-0.34766h-0.68359z" fill="#808080"/>
+ <g transform="matrix(.77119 0 0 .77119 -1.0816 -.33899)" fill="#4d82b8">
+ <path d="m2.6224 12c-0.34413 0.0015-0.62238 0.29942-0.62241 0.66647v6.6647c-7.76e-4 0.56568 0.61783 0.87517 1.0251 0.51287l3.7491-3.3324c0.30104-0.26653 0.30104-0.75922 0-1.0257l-3.7491-3.3324c-0.11312-0.10013-0.25573-0.15452-0.40273-0.1536z"/>
+ <rect x="8" y="15" width="6" height="2" ry=".9661"/>
+ <path d="m16.967 15c-0.53522 0-0.9668 0.43158-0.9668 0.9668v0.06641c0 0.53522 0.43158 0.9668 0.9668 0.9668h1.5527l1.0176-1.0273-0.94726-0.97266h-1.623z"/>
+ </g>
+ <path d="m4.5 15.084c-0.554 0-1 0.446-1 1v5.9414h1v-5.9414h7.4746l-0.19922-0.19531a1.0949 1.0949 0 0 1-0.32422-0.80469h-6.9512zm13.344 0.5293-0.44531 0.4707h0.89258l-0.44727-0.4707zm1.6562 1.7461v4.666h1v-3.7363a1.0949 1.0949 0 0 1-0.35547-0.25l-0.64453-0.67969z" fill="#808080"/>
+ <path d="m23.539 15.289-3.2343-3.291 3.1121-3.4476-2.2435-2.1355-3.2028 3.2854-3.2678-3.2854-2.3342 2.2141 3.2678 3.355-3.2678 3.3015 2.3342 2.2998 3.264-3.4497 3.2715 3.4497z" fill="#e68497" stroke-width=".77119"/>
+</svg>
diff --git a/loleaflet/images/lc_groupoutlinemenu.svg b/loleaflet/images/lc_groupoutlinemenu.svg
new file mode 100644
index 000000000..a8bd1bf35
--- /dev/null
+++ b/loleaflet/images/lc_groupoutlinemenu.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m4 3c-.554 0-1 .446-1 1v9c0 .554.446 1 1 1h11c.554 0 1-.446 1-1v-9c0-.554-.446-1-1-1zm0 1h11v9h-11z" fill="#808080"/><path d="m4 4h11v9h-11z" fill="#fff"/><path d="m9 10c-.554 0-1 .446-1 1v9c0 .554.446 1 1 1h11c.554 0 1-.446 1-1v-9c0-.554-.446-1-1-1zm0 1h11v9h-11z" fill="#808080"/><path d="m16 11v2c0 .554-.446 1-1 1h-6v6h11v-9z" fill="#fff"/><path d="m2 2h3v3h-3z" fill="#4d82b8"/><path d="m19 2h3v3h-3z" fill="#4d82b8"/><path d="m2 19h3v3h-3z" fill="#4d82b8"/><path d="m19 19h3v3h-3z" fill="#4d82b8"/><g fill="#fff"><path d="m3 3h1v1h-1z"/><path d="m20 3h1v1h-1z"/><path d="m20 20h1v1h-1z"/><path d="m3 20h1v1h-1z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertbreakmenu.svg b/loleaflet/images/lc_insertbreakmenu.svg
new file mode 100644
index 000000000..65af4963c
--- /dev/null
+++ b/loleaflet/images/lc_insertbreakmenu.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><g fill="#4d82b8"><path d="m2.622407 12.000012c-.3441257.0015-.622375.299419-.6224063.666472v6.664721c-.000776.565685.6178312.875171 1.0251389.512871l3.7490814-3.33236c.3010387-.266529.3010387-.759215 0-1.025743l-3.7490814-3.332361c-.1131223-.100131-.2557286-.15452-.4027326-.1536z"/><rect height="2" ry=".966102" width="6" x="8" y="15"/><rect height="2" ry=".966102" width="6" x="16" y="15"/><rect height="2" ry=".966102" width="6" x="24" y="15"/></g><path d="m6.9667969 20c-.5352205 0-.9667969.431576-.9667969.966797v8.033203h1v-8h20v8h1v-8.033203c0-.535221-.431576-.966797-.966797-.966797z" fill="#808080"/><path d="m7 21v8h20v-8z" fill="#fff"/><path d="m6.9667969 12c-.5352205 0-.9667969-.431576-.9667969-.966797v-8.033203h1v8h20v-8h1v8.033203c0 .535221-.431576.966797-.966797.966797z" fill="#808080"/><path d="m7 11v-8h20v8z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertcolumnsmenu.svg b/loleaflet/images/lc_insertcolumnsmenu.svg
new file mode 100644
index 000000000..38a4af1d6
--- /dev/null
+++ b/loleaflet/images/lc_insertcolumnsmenu.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m21 3v12h-2v-3c0-1.090703-.909297-2-2-2s-2 .909297-2 2v3h-3c-.363969 0-.703481.107739-1 .283203v-12.283203zm-11 0v14 4h-7v-18zm1 15.716797c.296519.175464.636031.283203 1 .283203h3v2h-4zm10 .283203v2h-2v-2z" fill="#fff"/><path d="m11 2v4h4v3h-4v1h4v2c0-.726734.407943-1.366449 1-1.716797v-.283203h5v3h-2v1h2v1h1v-5-1-3-3-1h-1-5zm5 4h5v3h-5zm-5 7v1h4v-1zm10 6v2h-2v1h2c.554 0 1-.446 1-1v-2zm-10 2v1h4v-1z" fill="#808080"/><g fill="#4d82b8"><path d="m2 2v18.5.5.5c0 .277.223.5.5.5h6.5.5.5v-.5-.5-19zm1 4h6v3h-6zm0 4h6v3h-6zm0 4h6v3h-6zm0 4h6v3h-6v-.5z"/><path d="m17 11c.554 0 1 .446 1 1v4h4c.554 0 1 .446 1 1s-.446 1-1 1h-4v4c0 .554-.446 1-1 1s-1-.446-1-1v-4h-4c-.554 0-1-.446-1-1s.446-1 1-1h4v-4c0-.554.446-1 1-1z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertrowbreak.svg b/loleaflet/images/lc_insertrowbreak.svg
index 65af4963c..e5d519167 100644
--- a/loleaflet/images/lc_insertrowbreak.svg
+++ b/loleaflet/images/lc_insertrowbreak.svg
@@ -1 +1,10 @@
-<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><g fill="#4d82b8"><path d="m2.622407 12.000012c-.3441257.0015-.622375.299419-.6224063.666472v6.664721c-.000776.565685.6178312.875171 1.0251389.512871l3.7490814-3.33236c.3010387-.266529.3010387-.759215 0-1.025743l-3.7490814-3.332361c-.1131223-.100131-.2557286-.15452-.4027326-.1536z"/><rect height="2" ry=".966102" width="6" x="8" y="15"/><rect height="2" ry=".966102" width="6" x="16" y="15"/><rect height="2" ry=".966102" width="6" x="24" y="15"/></g><path d="m6.9667969 20c-.5352205 0-.9667969.431576-.9667969.966797v8.033203h1v-8h20v8h1v-8.033203c0-.535221-.431576-.966797-.966797-.966797z" fill="#808080"/><path d="m7 21v8h20v-8z" fill="#fff"/><path d="m6.9667969 12c-.5352205 0-.9667969-.431576-.9667969-.966797v-8.033203h1v8h20v-8h1v8.033203c0 .535221-.431576.966797-.966797.966797z" fill="#808080"/><path d="m7 11v-8h20v8z" fill="#fff"/></svg>
\ No newline at end of file
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m4.5 8.9153c-0.554 0-1-0.446-1-1v-5.9414h1v5.9414h15v-5.9414h1v5.9414c0 0.554-0.446 1-1 1z" fill="#808080"/>
+ <path d="m4.5 15.084c-0.554 0-1 0.446-1 1v5.9414h1v-5.9414h15v5.9414h1v-5.9414c0-0.554-0.446-1-1-1z" fill="#808080"/>
+ <g transform="matrix(.7724 0 0 .7724 -1.0841 -.3584)" fill="#4d82b8">
+ <path d="m2.6224 12c-0.34413 0.0015-0.62238 0.29942-0.62241 0.66647v6.6647c-7.76e-4 0.56568 0.61783 0.87517 1.0251 0.51287l3.7491-3.3324c0.30104-0.26653 0.30104-0.75922 0-1.0257l-3.7491-3.3324c-0.11312-0.10013-0.25573-0.15452-0.40273-0.1536z" style=""/>
+ <rect x="8" y="15" width="6" height="2" ry=".9661" style=""/>
+ <rect x="16" y="15" width="6" height="2" ry=".9661" style=""/>
+ <rect x="24" y="15" width="6" height="2" ry=".9661" style=""/>
+ </g>
+</svg>
diff --git a/loleaflet/images/lc_insertrowsmenu.svg b/loleaflet/images/lc_insertrowsmenu.svg
new file mode 100644
index 000000000..9d11d146d
--- /dev/null
+++ b/loleaflet/images/lc_insertrowsmenu.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 3v5h18v-5zm0 6v12h12v-2h-3c-1.090703 0-2-.909297-2-2s.909297-2 2-2h3v-3c0-1.090703.909297-2 2-2s2 .909297 2 2v3h2v-6zm16 10v2h2v-2z" fill="#fff"/><path d="m2 9v1 11c0 .554.446 1 1 1h12v-1h-6v-3h1.283203c-.175464-.296519-.283203-.636031-.283203-1h-1v-3h6v-1h-6v-3h6v2c0-.726734.407943-1.366449 1-1.716797v-.283203h5v3h-2v1h2v1h1v-5-1zm1 1h5v3h-5zm0 4h5v3h-5zm0 4h5v3h-5zm18 1v2h-2v1h2c.554 0 1-.446 1-1v-2z" fill="#808080"/><g fill="#4d82b8"><path d="m17 11c-.554 0-1 .446-1 1v4h-4c-.554 0-1 .446-1 1s.446 1 1 1h4v4c0 .554.446 1 1 1s1-.446 1-1v-4h4c.554 0 1-.446 1-1s-.446-1-1-1h-4v-4c0-.554-.446-1-1-1z"/><path d="m2 3v5h20v-5zm1 1h5v3h-5zm6 0h6v3h-6zm7 0h5v3h-5z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 88b455d69..7bd57d538 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -581,19 +581,19 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:SelectAll'}
]},
{name: _UNO('.uno:SheetMenu', 'spreadsheet'), id: 'sheetmenu', type: 'menu', menu: [
- {name: _UNO('.uno:InsertRowsMenu', 'spreadsheet'), type: 'menu', menu: [
+ {name: _UNO('.uno:InsertRowsMenu', 'spreadsheet'), id: 'insertrowsmenu', type: 'menu', menu: [
{uno: '.uno:InsertRowsBefore'},
{uno: '.uno:InsertRowsAfter'}]},
- {name: _UNO('.uno:InsertColumnsMenu', 'spreadsheet'), type: 'menu', menu: [
+ {name: _UNO('.uno:InsertColumnsMenu', 'spreadsheet'), id: 'insertcolumnsmenu', type: 'menu', menu: [
{uno: '.uno:InsertColumnsBefore'},
{uno: '.uno:InsertColumnsAfter'}]},
- {name: _UNO('.uno:InsertBreakMenu', 'spreadsheet'), type: 'menu', menu: [
+ {name: _UNO('.uno:InsertBreakMenu', 'spreadsheet'), id: 'insertbreakmenu', type: 'menu', menu: [
{uno: '.uno:InsertRowBreak'},
{uno: '.uno:InsertColumnBreak'}]},
{type: 'separator'},
{uno: '.uno:DeleteRows'},
{uno: '.uno:DeleteColumns'},
- {name: _UNO('.uno:DelBreakMenu', 'spreadsheet'), type: 'menu', menu: [
+ {name: _UNO('.uno:DelBreakMenu', 'spreadsheet'), id: 'delbreakmenu', type: 'menu', menu: [
{uno: '.uno:DeleteRowbreak'},
{uno: '.uno:DeleteColumnbreak'}]}
]},
@@ -604,7 +604,7 @@ L.Control.Menubar = L.Control.extend({
{type: 'separator'},
{uno: '.uno:DataFilterAutoFilter'},
{type: 'separator'},
- {name: _UNO('.uno:GroupOutlineMenu', 'spreadsheet'), type: 'menu', menu: [
+ {name: _UNO('.uno:GroupOutlineMenu', 'spreadsheet'), id: 'groupoutlinemenu', type: 'menu', menu: [
{uno: '.uno:Group'},
{uno: '.uno:Ungroup'},
{type: 'separator'},
More information about the Libreoffice-commits
mailing list