From 537f0074613aca731483016b1f25c5d94d32e7c6 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 17 May 2021 19:51:12 +0300 Subject: [PATCH 1/4] [mobile] Fix view comment for tablet --- .../lib/view/collaboration/Comments.jsx | 3 ++- .../mobile/resources/less/comments.less | 21 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/apps/common/mobile/lib/view/collaboration/Comments.jsx b/apps/common/mobile/lib/view/collaboration/Comments.jsx index 08f2666da..f94fceee9 100644 --- a/apps/common/mobile/lib/view/collaboration/Comments.jsx +++ b/apps/common/mobile/lib/view/collaboration/Comments.jsx @@ -726,6 +726,7 @@ const CommentList = inject("storeComments", "storeAppOptions")(observer(({storeC +
@@ -794,6 +795,7 @@ const CommentList = inject("storeComments", "storeAppOptions")(observer(({storeC +
) })); @@ -830,7 +832,6 @@ const ViewCommentSheet = ({closeCurComments, onCommentMenuClick, onResolveCommen } }; const handleTouchEnd = (event) => { - console.log('end'); const touchObj = event.changedTouches[0]; const swipeEnd = parseInt(touchObj.clientY); const dist = swipeEnd - stateStartY; diff --git a/apps/common/mobile/resources/less/comments.less b/apps/common/mobile/resources/less/comments.less index dfbd20991..4224d2f2c 100644 --- a/apps/common/mobile/resources/less/comments.less +++ b/apps/common/mobile/resources/less/comments.less @@ -165,9 +165,15 @@ #view-comment-popover { background-color: @white; - .page .page-content { - padding: 16px; - padding-left: 0; + .pages { + position: absolute; + } + .page { + border-radius: var(--f7-popover-border-radius); + .page-content { + padding: 16px 16px 60px 0; + border-radius: var(--f7-popover-border-radius); + } } .comment-list { .item-content { @@ -178,6 +184,9 @@ } } } + .toolbar { + border-radius: 0 0 var(--f7-popover-border-radius) var(--f7-popover-border-radius); + } } .page-current-comment { @@ -200,10 +209,12 @@ } } +.dialog.modal-in { + z-index: 14000; +} + .dialog-backdrop.backdrop-in { - &.over-popover { z-index: 13600; - } } .no-comments { From e183568395b9a19d19bf93d15618236e20f8ae62 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 18 May 2021 12:54:01 +0300 Subject: [PATCH 2/4] [DE mobile] Show add other as the first tab when we open insert menu --- apps/documenteditor/mobile/src/view/add/Add.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/documenteditor/mobile/src/view/add/Add.jsx b/apps/documenteditor/mobile/src/view/add/Add.jsx index c691dfce4..7e490ea58 100644 --- a/apps/documenteditor/mobile/src/view/add/Add.jsx +++ b/apps/documenteditor/mobile/src/view/add/Add.jsx @@ -153,6 +153,8 @@ const Add = props => { f7.popup.open('.add-popup'); else f7.popover.open('#add-popover', '#btn-add'); + f7.tab.show('#add-other', false); + return () => { // component will unmount } From 5a226351570fd4b683352a530c5e83f47e66d2fd Mon Sep 17 00:00:00 2001 From: IlPer <84379141+IlPer@users.noreply.github.com> Date: Tue, 18 May 2021 14:03:15 +0300 Subject: [PATCH 3/4] Add files via upload --- .../embed/resources/img/icon-menu-sprite.svg | 140 ++++++++---------- 1 file changed, 65 insertions(+), 75 deletions(-) diff --git a/apps/common/embed/resources/img/icon-menu-sprite.svg b/apps/common/embed/resources/img/icon-menu-sprite.svg index 773879001..9060893d3 100644 --- a/apps/common/embed/resources/img/icon-menu-sprite.svg +++ b/apps/common/embed/resources/img/icon-menu-sprite.svg @@ -1,80 +1,70 @@ - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 07950fae3cbcb2c586e22e5c5e631d56139ebe28 Mon Sep 17 00:00:00 2001 From: IlPer <84379141+IlPer@users.noreply.github.com> Date: Tue, 18 May 2021 14:47:50 +0300 Subject: [PATCH 4/4] Update icon-menu-sprite.svg --- .../embed/resources/img/icon-menu-sprite.svg | 210 ++++++++++++------ 1 file changed, 146 insertions(+), 64 deletions(-) diff --git a/apps/common/embed/resources/img/icon-menu-sprite.svg b/apps/common/embed/resources/img/icon-menu-sprite.svg index 9060893d3..292b8c569 100644 --- a/apps/common/embed/resources/img/icon-menu-sprite.svg +++ b/apps/common/embed/resources/img/icon-menu-sprite.svg @@ -1,70 +1,152 @@ - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +