diff --git a/src/components/events/partials/ModalTabsAndPages/EventDetailsCommentsTab.tsx b/src/components/events/partials/ModalTabsAndPages/EventDetailsCommentsTab.tsx index 9a450e4ef5..04cd70a269 100644 --- a/src/components/events/partials/ModalTabsAndPages/EventDetailsCommentsTab.tsx +++ b/src/components/events/partials/ModalTabsAndPages/EventDetailsCommentsTab.tsx @@ -309,7 +309,42 @@ const EventDetailsCommentsTab = ({ } > - {/* submit button for comment reply (only active, if text has been written) */} + {/* 'resolved' checkbox */} + {hasAccess( + "ROLE_UI_EVENTS_DETAILS_COMMENTS_RESOLVE", + user + ) && ( + <> +
+ + setCommentReplyIsResolved(!commentReplyIsResolved) + } + /> + +
+ + )} + + {/* cancel button (exits reply mode) */} + + + {/* submit button for comment reply (only active, if text has been written) */} - - {/* cancel button (exits reply mode) */} - - - {/* 'resolved' checkbox */} - {hasAccess( - "ROLE_UI_EVENTS_DETAILS_COMMENTS_RESOLVE", - user - ) && ( - <> - - setCommentReplyIsResolved(!commentReplyIsResolved) - } - /> - - - )} ) } diff --git a/src/styles/components/modals/_modal-components.scss b/src/styles/components/modals/_modal-components.scss index d2abc482fb..354b570621 100644 --- a/src/styles/components/modals/_modal-components.scss +++ b/src/styles/components/modals/_modal-components.scss @@ -135,29 +135,39 @@ @include border-bottom-radius($main-border-radius); height: 191px; padding: 3%; - - .drop-down-container { - width: 100%; - } + display: flex; + flex-wrap: wrap; textarea { + flex: 100%; width: 100%; height: 80px; resize: none; - margin-bottom: 20px; + margin-bottom: 24px; + } + + .editable { + flex: 50% } - .btn { + .editable > div { + width: 50%; + } + + button.save { + min-width: 100px; @include btn(green); - padding: 10px 15px; - float: right; } - .drop-down-container { - width: 250px; - display: inline-block; + button.cancel { + min-width: 100px; + @include btn(red); + } + .resolved-checkbox { + flex: 20%; + } } } @@ -734,3 +744,4 @@ } } } +