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 <Link href='#' onClick={onViewNextComment}><Icon slot='media' icon='icon-next'/></Link> </div> </Toolbar> + <div className='pages'> <Page className='page-current-comment'> <List className='comment-list'> <ListItem> @@ -794,6 +795,7 @@ const CommentList = inject("storeComments", "storeAppOptions")(observer(({storeC <CommentActions comment={comment} onCommentMenuClick={onCommentMenuClick} opened={commentActionsOpened} openActionComment={openActionComment}/> <ReplyActions comment={comment} reply={reply} onCommentMenuClick={onCommentMenuClick} opened={replyActionsOpened} openActionReply={openActionReply}/> </Page> + </div> </Fragment> ) })); @@ -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 {