Fixing system console and changing swapping icon with reply icon

Этот коммит содержится в:
Asaad Mahmood
2016-02-01 19:37:07 +05:00
родитель 4a214cdaa2
Коммит 4abe6037bb
5 изменённых файлов: 56 добавлений и 57 удалений

Просмотреть файл

@@ -104,10 +104,12 @@ export default class Analytics extends React.Component {
let content; let content;
if (this.props.postCountsDay.labels.length === 0) { if (this.props.postCountsDay.labels.length === 0) {
content = ( content = (
<FormattedMessage <h5>
id='admin.analytics.meaningful' <FormattedMessage
defaultMessage='Not enough data for a meaningful representation.' id='admin.analytics.meaningful'
/> defaultMessage='Not enough data for a meaningful representation.'
/>
</h5>
); );
} else { } else {
content = ( content = (
@@ -153,10 +155,12 @@ export default class Analytics extends React.Component {
let content; let content;
if (this.props.userCountsWithPostsDay.labels.length === 0) { if (this.props.userCountsWithPostsDay.labels.length === 0) {
content = ( content = (
<FormattedMessage <h5>
id='admin.analytics.meaningful' <FormattedMessage
defaultMessage='Not enough data for a meaningful representation.' id='admin.analytics.meaningful'
/> defaultMessage='Not enough data for a meaningful representation.'
/>
</h5>
); );
} else { } else {
content = ( content = (

Просмотреть файл

@@ -22,26 +22,6 @@ export default class PostInfo extends React.Component {
this.handlePermalinkCopy = this.handlePermalinkCopy.bind(this); 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() { createDropdown() {
var post = this.props.post; var post = this.props.post;
var isOwner = UserStore.getCurrentId() === post.user_id; var isOwner = UserStore.getCurrentId() === post.user_id;
@@ -62,6 +42,23 @@ export default class PostInfo extends React.Component {
dataComments = this.props.commentCount; 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( dropdownContents.push(
<li <li
key='copyLink' key='copyLink'
@@ -176,7 +173,7 @@ export default class PostInfo extends React.Component {
> >
<span <span
className='comment-icon' className='comment-icon'
dangerouslySetInnerHTML={{__html: Constants.COMMENT_ICON}} dangerouslySetInnerHTML={{__html: Constants.REPLY_ICON}}
/> />
{commentCountText} {commentCountText}
</a> </a>
@@ -184,7 +181,6 @@ export default class PostInfo extends React.Component {
} }
var dropdown = this.createDropdown(); var dropdown = this.createDropdown();
var replyLink = this.createReplyLink();
const permalink = TeamStore.getCurrentTeamUrl() + '/pl/' + post.id; const permalink = TeamStore.getCurrentTeamUrl() + '/pl/' + post.id;
const copyButtonText = this.state.copiedLink ? (<div>{'Copy '}<i className='fa fa-check'/></div>) : 'Copy'; 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>
<li className='col col__reply'> <li className='col col__reply'>
{replyLink}
<div <div
className='dropdown' className='dropdown'
ref='dotMenu' ref='dotMenu'

Просмотреть файл

@@ -89,7 +89,7 @@ export default class SearchResultsItem extends React.Component {
> >
<span <span
className='comment-icon' className='comment-icon'
dangerouslySetInnerHTML={{__html: Constants.COMMENT_ICON}} dangerouslySetInnerHTML={{__html: Constants.REPLY_ICON}}
/> />
</a> </a>
</li> </li>

Просмотреть файл

@@ -597,7 +597,7 @@ body.ios {
position: absolute; position: absolute;
right: 0; right: 0;
top: 30px; top: 30px;
width: 85px; width: 65px;
white-space: nowrap; white-space: nowrap;
} }
@@ -666,7 +666,7 @@ body.ios {
word-wrap: break-word; word-wrap: break-word;
padding: 0.2em 0.5em 0em; padding: 0.2em 0.5em 0em;
@include legacy-pie-clearfix; @include legacy-pie-clearfix;
width: calc(100% - 95px); width: calc(100% - 75px);
p { p {
margin: 0 0 0.4em; margin: 0 0 0.4em;

Просмотреть файл

@@ -72,24 +72,20 @@
} }
}
@media screen and (max-width: 768px) {
.signup-team__container {
font-size: 1em;
}
.date-separator.hovered--after:before, .new-separator.hovered--after:before {
background: none !important;
}
.post { .post {
.post-list__content & {
&:hover {
background: transparent;
}
.comment-icon__container {
visibility: hidden;
}
}
.dropdown, .post__reply {
visibility: visible;
}
.post__dropdown { .post__dropdown {
line-height: 9px; line-height: 9px;
text-decoration: none; text-decoration: none;
@@ -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 { .post__body {
width: calc(100% - 75px); width: calc(100% - 75px);