chat: normalize line height

This commit is contained in:
Liam Fitzgerald 2020-09-30 23:23:42 +10:00
parent b426cb4d37
commit 6c33e01a64
5 changed files with 35 additions and 33 deletions

View File

@ -159,35 +159,37 @@ export class ChatScreen extends Component<ChatScreenProps, ChatScreenState> {
>
{this.state.dragover ? <SubmitDragger /> : null}
<ChatHeader {...props} />
<ChatWindow
isChatMissing={isChatMissing}
isChatLoading={isChatLoading}
isChatUnsynced={isChatUnsynced}
unreadCount={unreadCount}
unreadMsg={unreadMsg}
stationPendingMessages={pendingMessages}
ship={props.match.params.ship}
{...props} />
<ChatInput
ref={this.chatInput}
api={props.api}
numMsgs={lastMsgNum}
station={props.station}
owner={deSig(props.match.params.ship || "")}
ownerContact={ownerContact}
envelopes={props.envelopes}
contacts={props.contacts}
onUnmount={(msg: string) => this.setState({
messages: this.state.messages.set(props.station, msg)
})}
s3={props.s3}
placeholder="Message..."
message={this.state.messages.get(props.station) || ""}
deleteMessage={() => this.setState({
messages: this.state.messages.set(props.station, "")
})}
hideAvatars={props.hideAvatars}
/>
<div className="h-100 w-100 overflow-hidden flex flex-column relative">
<ChatWindow
isChatMissing={isChatMissing}
isChatLoading={isChatLoading}
isChatUnsynced={isChatUnsynced}
unreadCount={unreadCount}
unreadMsg={unreadMsg}
stationPendingMessages={pendingMessages}
ship={props.match.params.ship}
{...props} />
<ChatInput
ref={this.chatInput}
api={props.api}
numMsgs={lastMsgNum}
station={props.station}
owner={deSig(props.match.params.ship || "")}
ownerContact={ownerContact}
envelopes={props.envelopes}
contacts={props.contacts}
onUnmount={(msg: string) => this.setState({
messages: this.state.messages.set(props.station, msg)
})}
s3={props.s3}
placeholder="Message..."
message={this.state.messages.get(props.station) || ""}
deleteMessage={() => this.setState({
messages: this.state.messages.set(props.station, "")
})}
hideAvatars={props.hideAvatars}
/>
</div>
</div>
);
}

View File

@ -247,7 +247,7 @@ export const MessageContent = ({ content, remoteContentPolicy, measure }) => {
);
} else if ('me' in content) {
return (
<p className='f7 i lh-copy v-top'>
<p className='f9 i lh-copy v-top'>
{content.me}
</p>
);

View File

@ -64,7 +64,7 @@ export default class TextContent extends Component {
&& (group[0] === content.text))) { // entire message is room name?
return (
<Link
className="bb b--black b--white-d f7 mono lh-copy v-top"
className="bb b--black b--white-d f9 mono lh-copy v-top"
to={'/~groups/join/' + group.input}>
{content.text}
</Link>

View File

@ -2,7 +2,7 @@ import React, { Component } from 'react';
import Welcome from './lib/welcome';
import { alphabetiseAssociations } from '~/logic/lib/util';
import SidebarInvite from '~/views/components/SidebarInvite';
import SidebarInvite from '~/views/components/Sidebar/SidebarInvite';
import { GroupItem } from './lib/group-item';
export class Sidebar extends Component {

View File

@ -161,7 +161,7 @@ h2 {
}
.unread-notice {
top: 48px;
top: 0px;
}
/* responsive */