diff options
author | Asaad Mahmood <asaad@spinpunch.com> | 2016-02-01 19:37:07 +0500 |
---|---|---|
committer | Asaad Mahmood <asaad@spinpunch.com> | 2016-02-01 19:37:07 +0500 |
commit | 4abe6037bbc57bba77b0ceb9014595e37f9d1710 (patch) | |
tree | 52043f9101b8d6ca692587d72c9599b6ab85e60b | |
parent | 4a214cdaa2912f48dec4361722522c424384af49 (diff) | |
download | chat-4abe6037bbc57bba77b0ceb9014595e37f9d1710.tar.gz chat-4abe6037bbc57bba77b0ceb9014595e37f9d1710.tar.bz2 chat-4abe6037bbc57bba77b0ceb9014595e37f9d1710.zip |
Fixing system console and changing swapping icon with reply icon
-rw-r--r-- | web/react/components/admin_console/analytics.jsx | 20 | ||||
-rw-r--r-- | web/react/components/post_info.jsx | 41 | ||||
-rw-r--r-- | web/react/components/search_results_item.jsx | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 4 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 40 |
5 files changed, 53 insertions, 54 deletions
diff --git a/web/react/components/admin_console/analytics.jsx b/web/react/components/admin_console/analytics.jsx index ff5903c62..a22c26c34 100644 --- a/web/react/components/admin_console/analytics.jsx +++ b/web/react/components/admin_console/analytics.jsx @@ -104,10 +104,12 @@ export default class Analytics extends React.Component { let content; if (this.props.postCountsDay.labels.length === 0) { content = ( - <FormattedMessage - id='admin.analytics.meaningful' - defaultMessage='Not enough data for a meaningful representation.' - /> + <h5> + <FormattedMessage + id='admin.analytics.meaningful' + defaultMessage='Not enough data for a meaningful representation.' + /> + </h5> ); } else { content = ( @@ -153,10 +155,12 @@ export default class Analytics extends React.Component { let content; if (this.props.userCountsWithPostsDay.labels.length === 0) { content = ( - <FormattedMessage - id='admin.analytics.meaningful' - defaultMessage='Not enough data for a meaningful representation.' - /> + <h5> + <FormattedMessage + id='admin.analytics.meaningful' + defaultMessage='Not enough data for a meaningful representation.' + /> + </h5> ); } else { content = ( diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx index 73b47024c..2bff675a9 100644 --- a/web/react/components/post_info.jsx +++ b/web/react/components/post_info.jsx @@ -22,26 +22,6 @@ export default class PostInfo extends React.Component { this.handlePermalinkCopy = this.handlePermalinkCopy.bind(this); } - createReplyLink() { - if (this.props.allowReply === 'true') { - var hideReply = ''; - - if (this.props.commentCount >= 1) { - hideReply = ' post__reply--hide'; - } - - return ( - <div className={'post__reply' + hideReply}> - <a - onClick={this.props.handleCommentClick} - href='#' - > - <span dangerouslySetInnerHTML={{__html: Constants.REPLY_ICON}}/> - </a> - </div> - ); - } - } createDropdown() { var post = this.props.post; var isOwner = UserStore.getCurrentId() === post.user_id; @@ -62,6 +42,23 @@ export default class PostInfo extends React.Component { dataComments = this.props.commentCount; } + if (this.props.allowReply === 'true') { + dropdownContents.push( + <li + key='replyLink' + role='presentation' + > + <a + className='link__reply theme' + href='#' + onClick={this.props.handleCommentClick} + > + {'Reply'} + </a> + </li> + ); + } + dropdownContents.push( <li key='copyLink' @@ -176,7 +173,7 @@ export default class PostInfo extends React.Component { > <span className='comment-icon' - dangerouslySetInnerHTML={{__html: Constants.COMMENT_ICON}} + dangerouslySetInnerHTML={{__html: Constants.REPLY_ICON}} /> {commentCountText} </a> @@ -184,7 +181,6 @@ export default class PostInfo extends React.Component { } var dropdown = this.createDropdown(); - var replyLink = this.createReplyLink(); const permalink = TeamStore.getCurrentTeamUrl() + '/pl/' + post.id; const copyButtonText = this.state.copiedLink ? (<div>{'Copy '}<i className='fa fa-check'/></div>) : 'Copy'; @@ -227,7 +223,6 @@ export default class PostInfo extends React.Component { /> </li> <li className='col col__reply'> - {replyLink} <div className='dropdown' ref='dotMenu' diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx index f235cac0a..e4f83eb1c 100644 --- a/web/react/components/search_results_item.jsx +++ b/web/react/components/search_results_item.jsx @@ -89,7 +89,7 @@ export default class SearchResultsItem extends React.Component { > <span className='comment-icon' - dangerouslySetInnerHTML={{__html: Constants.COMMENT_ICON}} + dangerouslySetInnerHTML={{__html: Constants.REPLY_ICON}} /> </a> </li> diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 1f7a55cd0..be85ef07b 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -597,7 +597,7 @@ body.ios { position: absolute; right: 0; top: 30px; - width: 85px; + width: 65px; white-space: nowrap; } @@ -666,7 +666,7 @@ body.ios { word-wrap: break-word; padding: 0.2em 0.5em 0em; @include legacy-pie-clearfix; - width: calc(100% - 95px); + width: calc(100% - 75px); p { margin: 0 0 0.4em; diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index a37974c7a..832481cc5 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -72,23 +72,19 @@ } - .post { - - .post-list__content & { +} - &:hover { - background: transparent; - } +@media screen and (max-width: 768px) { - .comment-icon__container { - visibility: hidden; - } + .signup-team__container { + font-size: 1em; + } - } + .date-separator.hovered--after:before, .new-separator.hovered--after:before { + background: none !important; + } - .dropdown, .post__reply { - visibility: visible; - } + .post { .post__dropdown { line-height: 9px; @@ -106,17 +102,21 @@ } - } + .post-list__content & { -} + &:hover { + background: transparent; + } -@media screen and (max-width: 768px) { + .comment-icon__container { + visibility: visible; + } - .signup-team__container { - font-size: 1em; - } + } - .post { + .dropdown, .post__reply { + visibility: visible; + } .post__body { width: calc(100% - 75px); |