diff options
| author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-05-30 20:19:29 +0500 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2017-05-30 08:19:29 -0700 |
| commit | b2453735b2109f8039204e59cece98cbac7bc3e7 (patch) | |
| tree | c19b4320467d8ba128e75e3c458af963bf22101c /webapp/components/search_results_item.jsx | |
| parent | 860e5d483cd952ec833c40312a2141bb3e4ef579 (diff) | |
| download | chat-b2453735b2109f8039204e59cece98cbac7bc3e7.tar.gz chat-b2453735b2109f8039204e59cece98cbac7bc3e7.tar.bz2 chat-b2453735b2109f8039204e59cece98cbac7bc3e7.zip | |
Minor Ui improvements (#6515)
* PLT-6645 - Improving copy pasting behaviour
* PLT-6149 - Fixing edited indicator in search
Diffstat (limited to 'webapp/components/search_results_item.jsx')
| -rw-r--r-- | webapp/components/search_results_item.jsx | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/webapp/components/search_results_item.jsx b/webapp/components/search_results_item.jsx index 71240ca48..4eb738065 100644 --- a/webapp/components/search_results_item.jsx +++ b/webapp/components/search_results_item.jsx @@ -150,7 +150,7 @@ export default class SearchResultsItem extends React.Component { let botIndicator; if (post.props && post.props.from_webhook) { - botIndicator = <li className='bot-indicator'>{Constants.BOT_NAME}</li>; + botIndicator = <div className='bot-indicator'>{Constants.BOT_NAME}</div>; } const profilePic = ( @@ -169,6 +169,11 @@ export default class SearchResultsItem extends React.Component { compactClass = ' post--compact'; } + let postClass = ''; + if (PostUtils.isEdited(this.props.post)) { + postClass += ' post--edited'; + } + let fileAttachment = null; if (post.file_ids && post.file_ids.length > 0) { fileAttachment = ( @@ -202,7 +207,7 @@ export default class SearchResultsItem extends React.Component { ); rhsControls = ( - <li className='col__controls'> + <div className='col__controls'> <CommentIcon idPrefix={'searchCommentIcon'} idCount={idCount} @@ -243,7 +248,7 @@ export default class SearchResultsItem extends React.Component { defaultMessage='Jump' /> </a> - </li> + </div> ); message = ( @@ -289,8 +294,8 @@ export default class SearchResultsItem extends React.Component { <div className='post__content'> {profilePicContainer} <div> - <ul className='post__header'> - <li className='col col__name'><strong> + <div className='post__header'> + <div className='col col__name'><strong> <UserProfile user={user} overwriteName={overrideUsername} @@ -298,18 +303,20 @@ export default class SearchResultsItem extends React.Component { status={this.props.status} isBusy={this.props.isBusy} /> - </strong></li> + </strong></div> {botIndicator} - <li className='col'> + <div className='col'> {this.renderTimeTag(post)} {pinnedBadge} {flagContent} - </li> + </div> {rhsControls} - </ul> + </div> <div className='search-item-snippet post__body'> - {message} - {fileAttachment} + <div className={postClass}> + {message} + {fileAttachment} + </div> </div> </div> </div> |