Clean up RSS conversation

pull/595/head
Maxim Shishmarev 6 years ago
parent 5d2c15fd24
commit e64ccbdd2b

@ -732,6 +732,16 @@
this.model.updateLastMessage();
if (this.model.isRss()) {
$('.compose').hide();
$('.conversation-stack').removeClass('conversation-stack-no-border');
$('.conversation-stack').addClass('conversation-stack-border');
} else {
$('.compose').show();
$('.conversation-stack').removeClass('conversation-stack-border');
$('.conversation-stack').addClass('conversation-stack-no-border');
}
// const statusPromise = this.throttledGetProfiles();
// // eslint-disable-next-line more/no-then
// this.statusFetch = statusPromise.then(() =>

@ -190,6 +190,22 @@
margin-bottom: -5px;
}
.conversation-stack-border {
border-bottom: solid;
border-color: white;
border-width: 4px;
}
.conversation-stack-no-border {
border-bottom: none;
}
.dark-theme {
.conversation-stack-border {
border-color: black;
}
}
.bottom-bar .preview-wrapper {
margin-top: 3px;
margin-left: 37px;

@ -1009,6 +1009,7 @@ export class Message extends React.PureComponent<Props, State> {
authorColor,
direction,
id,
isRss,
timestamp,
} = this.props;
const { expired, expiring } = this.state;
@ -1049,7 +1050,9 @@ export class Message extends React.PureComponent<Props, State> {
)}
>
{this.renderError(direction === 'incoming')}
{this.renderMenu(direction === 'outgoing', triggerId)}
{isRss
? null
: this.renderMenu(direction === 'outgoing', triggerId)}
<div
className={classNames(
'module-message__container',
@ -1073,7 +1076,9 @@ export class Message extends React.PureComponent<Props, State> {
{this.renderAvatar()}
</div>
{this.renderError(direction === 'outgoing')}
{this.renderMenu(direction === 'incoming', triggerId)}
{isRss
? null
: this.renderMenu(direction === 'incoming', triggerId)}
{this.renderContextMenu(triggerId)}
{this.renderContextMenu(rightClickTriggerId)}
</div>

Loading…
Cancel
Save