diff options
author | Dessalines <tyhou13@gmx.com> | 2019-09-11 17:20:57 -0700 |
---|---|---|
committer | Dessalines <tyhou13@gmx.com> | 2019-09-11 17:20:57 -0700 |
commit | c2ddbec504707e84ca54176e4cd85c9d44f44afa (patch) | |
tree | 561a0fa7df415f2f2ff5cd0164af8681fd530059 /ui/src/components | |
parent | 0eb7d6c30487b383720d8e0aa417926a37df3aef (diff) |
Fixing tribute positioning issue, moving recent comments to top.
Diffstat (limited to 'ui/src/components')
-rw-r--r-- | ui/src/components/comment-form.tsx | 10 | ||||
-rw-r--r-- | ui/src/components/post.tsx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ui/src/components/comment-form.tsx b/ui/src/components/comment-form.tsx index 5b60aced..5baec725 100644 --- a/ui/src/components/comment-form.tsx +++ b/ui/src/components/comment-form.tsx @@ -6,7 +6,7 @@ import { WebSocketService, UserService } from '../services'; import * as autosize from 'autosize'; import { i18n } from '../i18next'; import { T } from 'inferno-i18next'; -import Tribute from 'tributejs/src/Tribute.js'; +import * as Tribute from 'tributejs'; import * as emojiShortName from 'emoji-short-name'; interface CommentFormProps { @@ -60,7 +60,7 @@ export class CommentForm extends Component<CommentFormProps, CommentFormState> { values: Object.entries(emojiShortName).map(e => {return {'key': e[1], 'val': e[0]}}), allowSpaces: false, autocompleteMode: true, - menuItemLimit: 10, + menuItemLimit: mentionDropdownFetchLimit, }, // Users { @@ -73,7 +73,7 @@ export class CommentForm extends Component<CommentFormProps, CommentFormState> { }, allowSpaces: false, autocompleteMode: true, - menuItemLimit: 10, + menuItemLimit: mentionDropdownFetchLimit, }, // Communities @@ -87,7 +87,7 @@ export class CommentForm extends Component<CommentFormProps, CommentFormState> { }, allowSpaces: false, autocompleteMode: true, - menuItemLimit: 10, + menuItemLimit: mentionDropdownFetchLimit, } ] }); @@ -123,7 +123,7 @@ export class CommentForm extends Component<CommentFormProps, CommentFormState> { <div class="mb-3"> <form onSubmit={linkEvent(this, this.handleCommentSubmit)}> <div class="form-group row"> - <div class="col-sm-12"> + <div className={`col-sm-12`}> <textarea id={this.id} className={`form-control ${this.state.previewMode && 'd-none'}`} value={this.state.commentForm.content} onInput={linkEvent(this, this.handleCommentContentChange)} required disabled={this.props.disabled} rows={2} maxLength={10000} /> {this.state.previewMode && <div className="md-div" dangerouslySetInnerHTML={mdToHtml(this.state.commentForm.content)} /> diff --git a/ui/src/components/post.tsx b/ui/src/components/post.tsx index 7e2dbd62..5047d20b 100644 --- a/ui/src/components/post.tsx +++ b/ui/src/components/post.tsx @@ -140,8 +140,8 @@ export class Post extends Component<any, PostState> { {this.commentsTree()} </div> <div class="col-12 col-sm-12 col-md-4"> - {this.sidebar()} {this.state.comments.length > 0 && this.newComments()} + {this.sidebar()} </div> </div> } @@ -173,7 +173,7 @@ export class Post extends Component<any, PostState> { newComments() { return ( - <div class="d-none d-md-block sticky-top new-comments card border-secondary"> + <div class="d-none d-md-block new-comments mb-3 card border-secondary"> <div class="card-body small"> <h6><T i18nKey="recent_comments">#</T></h6> {this.state.comments.map(comment => |