From acc1f43a9a1e3579caeaeb10ccb32010b36ddf5d Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 7 May 2021 17:34:02 +0300 Subject: [PATCH] [common] Bug 47778 --- .../mobile/lib/view/collaboration/Comments.jsx | 8 ++++---- apps/common/mobile/resources/less/comments.less | 5 ++++- apps/common/mobile/resources/less/ios/comments.less | 13 +++++++++++++ .../mobile/resources/less/material/comments.less | 13 +++++++++++++ 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/apps/common/mobile/lib/view/collaboration/Comments.jsx b/apps/common/mobile/lib/view/collaboration/Comments.jsx index dd1c5d031..f2a788fba 100644 --- a/apps/common/mobile/lib/view/collaboration/Comments.jsx +++ b/apps/common/mobile/lib/view/collaboration/Comments.jsx @@ -127,7 +127,7 @@ const AddCommentDialog = inject("storeComments")(observer(props => { }).open(); }); return ( -
+
); })); @@ -303,7 +303,7 @@ const EditCommentDialog = inject("storeComments")(observer(({storeComments, comm }).open(); }); return ( -
+
); })); @@ -428,7 +428,7 @@ const AddReplyDialog = inject("storeComments")(observer(({storeComments, userInf }).open(); }); return ( -
+
); })); @@ -559,7 +559,7 @@ const EditReplyDialog = inject("storeComments")(observer(({storeComments, commen }).open(); }); return ( -
+
); })); diff --git a/apps/common/mobile/resources/less/comments.less b/apps/common/mobile/resources/less/comments.less index bf433122a..c8a856034 100644 --- a/apps/common/mobile/resources/less/comments.less +++ b/apps/common/mobile/resources/less/comments.less @@ -12,10 +12,13 @@ } .wrap-textarea { margin-top: 6px; + .input { + height: 100%; + } textarea { font-size: 14px; margin-top: 0; - min-height: 100px; + height: 100%; padding: 5px 0; } } diff --git a/apps/common/mobile/resources/less/ios/comments.less b/apps/common/mobile/resources/less/ios/comments.less index 0f25bb353..a00df23c6 100644 --- a/apps/common/mobile/resources/less/ios/comments.less +++ b/apps/common/mobile/resources/less/ios/comments.less @@ -1,4 +1,17 @@ .device-ios { + .wrap-comment { + height: calc(100% - 60px); + } + .add-comment-popup, .add-reply-popup, .add-comment-dialog, .add-reply-dialog { + .wrap-textarea { + height: calc(100% - 34px); + } + } + .edit-comment-popup, .edit-reply-popup, .edit-comment-dialog, .edit-reply-dialog { + .wrap-textarea { + height: calc(100% - 52px); + } + } .comment-list { .reply-item { .item-inner:after { diff --git a/apps/common/mobile/resources/less/material/comments.less b/apps/common/mobile/resources/less/material/comments.less index 90a0f1cfe..92616d7c2 100644 --- a/apps/common/mobile/resources/less/material/comments.less +++ b/apps/common/mobile/resources/less/material/comments.less @@ -1,4 +1,17 @@ .device-android { + .wrap-comment { + height: calc(100% - 72px); + } + .add-comment-popup, .add-reply-popup, .add-comment-dialog, .add-reply-dialog { + .wrap-textarea { + height: calc(100% - 41px); + } + } + .edit-comment-popup, .edit-reply-popup, .edit-comment-dialog, .edit-reply-dialog { + .wrap-textarea { + height: calc(100% - 56px); + } + } .wrap-comment, .comment-list, .reply-list { .comment-header, .reply-header { display: flex;