mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix styling for left pane: muted conversations and message requests

Browse source
This commit is contained in:
Evan Hahn 2021-03-12 16:04:56 -06:00 • committed by Josh Perez
parent d5f2492ce5
commit 746e6781ae
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ts/components/conversationList/BaseConversationListItem.tsx
View file

@ -18,7 +18,7 @@ const CONTENT_CLASS_NAME = `${BASE_CLASS_NAME}__content`;
const HEADER_CLASS_NAME = `${CONTENT_CLASS_NAME}__header`; const HEADER_CLASS_NAME = `${CONTENT_CLASS_NAME}__header`;
export const DATE_CLASS_NAME = `${HEADER_CLASS_NAME}__date`; export const DATE_CLASS_NAME = `${HEADER_CLASS_NAME}__date`;
const TIMESTAMP_CLASS_NAME = `${DATE_CLASS_NAME}__timestamp`; const TIMESTAMP_CLASS_NAME = `${DATE_CLASS_NAME}__timestamp`;
export const MESSAGE_CLASS_NAME = `${CONTENT_CLASS_NAME}__message`; const MESSAGE_CLASS_NAME = `${CONTENT_CLASS_NAME}__message`;
export const MESSAGE_TEXT_CLASS_NAME = `${MESSAGE_CLASS_NAME}__text`; export const MESSAGE_TEXT_CLASS_NAME = `${MESSAGE_CLASS_NAME}__text`;
const CHECKBOX_CLASS_NAME = `${BASE_CLASS_NAME}__checkbox`; const CHECKBOX_CLASS_NAME = `${BASE_CLASS_NAME}__checkbox`;

5
ts/components/conversationList/ConversationListItem.tsx
View file

@ -11,7 +11,6 @@ import classNames from 'classnames';
import { import {
BaseConversationListItem, BaseConversationListItem,
MESSAGE_CLASS_NAME,
MESSAGE_TEXT_CLASS_NAME, MESSAGE_TEXT_CLASS_NAME,
} from './BaseConversationListItem'; } from './BaseConversationListItem';
import { MessageBody } from '../conversation/MessageBody'; import { MessageBody } from '../conversation/MessageBody';
@ -123,10 +122,10 @@ export const ConversationListItem: FunctionComponent<Props> = React.memo(
messageText = ( messageText = (
<> <>
{muteExpiresAt && Date.now() < muteExpiresAt && ( {muteExpiresAt && Date.now() < muteExpiresAt && (
<span className={`${MESSAGE_CLASS_NAME}__muted`} /> <span className={`${MESSAGE_TEXT_CLASS_NAME}__muted`} />
)} )}
{!acceptedMessageRequest ? ( {!acceptedMessageRequest ? (
<span className={`${MESSAGE_CLASS_NAME}__message-request`}> <span className={`${MESSAGE_TEXT_CLASS_NAME}__message-request`}>
{i18n('ConversationListItem--message-request')} {i18n('ConversationListItem--message-request')}
</span> </span>
) : typingContact ? ( ) : typingContact ? (