urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-28 13:54:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3762 from urbit/mp/chat/timestamp-top

Browse Source 
chat: timestamps are lined at top of messages
This commit is contained in:
matildepark 2020-10-21 19:04:58 -04:00 committed by GitHub
commit 4706db8c40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/interface/src/views/apps/chat/components/ChatMessage.tsx
View File

@ -97,7 +97,7 @@ export default class ChatMessage extends Component<ChatMessageProps> {
const containerClass = `${renderSigil const containerClass = `${renderSigil
? `cf pt2 pl3 lh-copy` ? `cf pt2 pl3 lh-copy`
: `items-center cf hide-child`} ${isPending ? 'o-40' : ''} ${className}` : `items-top cf hide-child`} ${isPending ? 'o-40' : ''} ${className}`
const timestamp = moment.unix(msg.when / 1000).format(renderSigil ? 'hh:mm a' : 'hh:mm'); const timestamp = moment.unix(msg.when / 1000).format(renderSigil ? 'hh:mm a' : 'hh:mm');
@ -255,7 +255,7 @@ export class MessageWithSigil extends PureComponent<MessageProps> {
export const MessageWithoutSigil = ({ timestamp, msg, remoteContentPolicy, measure }) => ( export const MessageWithoutSigil = ({ timestamp, msg, remoteContentPolicy, measure }) => (
<> <>
<p className="child pr1 mono f9 gray2 dib">{timestamp}</p> <Text mono gray display='inline-block' pr='1' pt='2px' lineHeight='tall' className="child">{timestamp}</Text>
<Box fontSize='14px' className="clamp-message" style={{ flexGrow: 1 }}> <Box fontSize='14px' className="clamp-message" style={{ flexGrow: 1 }}>
<MessageContent content={msg.letter} remoteContentPolicy={remoteContentPolicy} measure={measure}/> <MessageContent content={msg.letter} remoteContentPolicy={remoteContentPolicy} measure={measure}/>
</Box> </Box>