diff options
| author | Dessalines <tyhou13@gmx.com> | 2020-06-23 21:11:38 -0400 |
|---|---|---|
| committer | Dessalines <tyhou13@gmx.com> | 2020-06-23 21:11:38 -0400 |
| commit | dc94e58cbf7e7de10d97331a3056380a3416e0b0 (patch) | |
| tree | 85ed25783b0470ead3012a9718aea50b39c940dd /ui/src/components/comment-node.tsx | |
| parent | fd6a040568239d2e6949394fdc0ce0f7ac70275c (diff) | |
| parent | 790b944031f9433be765936763d848ffa6e1b496 (diff) | |
Merge branch 'master' into federation_merge_from_master_2
Diffstat (limited to 'ui/src/components/comment-node.tsx')
| -rw-r--r-- | ui/src/components/comment-node.tsx | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/ui/src/components/comment-node.tsx b/ui/src/components/comment-node.tsx index ca828a45..155efe8e 100644 --- a/ui/src/components/comment-node.tsx +++ b/ui/src/components/comment-node.tsx @@ -132,7 +132,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> { > <div id={`comment-${node.comment.id}`} - className={`details comment-node border-top border-light ${ + className={`details comment-node border-top border-light py-2 ${ this.isCommentNew ? 'mark' : '' }`} style={ @@ -148,7 +148,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> { 'ml-2' }`} > - <div class="d-flex flex-wrap align-items-center mb-1 mt-1 text-muted small"> + <div class="d-flex flex-wrap align-items-center text-muted small"> <span class="mr-2"> <UserListing user={{ @@ -299,25 +299,6 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> { )} <button class="btn btn-link btn-animate text-muted" - onClick={linkEvent(this, this.handleSaveCommentClick)} - data-tippy-content={ - node.comment.saved ? i18n.t('unsave') : i18n.t('save') - } - > - {this.state.saveLoading ? ( - this.loadingIcon - ) : ( - <svg - class={`icon icon-inline ${ - node.comment.saved && 'text-warning' - }`} - > - <use xlinkHref="#icon-star"></use> - </svg> - )} - </button> - <button - class="btn btn-link btn-animate text-muted" onClick={linkEvent(this, this.handleReplyClick)} data-tippy-content={i18n.t('reply')} > @@ -352,6 +333,30 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> { )} {!this.props.showContext && this.linkBtn} <button + class="btn btn-link btn-animate text-muted" + onClick={linkEvent( + this, + this.handleSaveCommentClick + )} + data-tippy-content={ + node.comment.saved + ? i18n.t('unsave') + : i18n.t('save') + } + > + {this.state.saveLoading ? ( + this.loadingIcon + ) : ( + <svg + class={`icon icon-inline ${ + node.comment.saved && 'text-warning' + }`} + > + <use xlinkHref="#icon-star"></use> + </svg> + )} + </button> + <button className="btn btn-link btn-animate text-muted" onClick={linkEvent(this, this.handleViewSource)} data-tippy-content={i18n.t('view_source')} |