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

View File

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

View File

@ -64,7 +64,7 @@ export default class TextContent extends Component {
&& (group[0] === content.text))) { // entire message is room name? && (group[0] === content.text))) { // entire message is room name?
return ( return (
<Link <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}> to={'/~groups/join/' + group.input}>
{content.text} {content.text}
</Link> </Link>

View File

@ -2,7 +2,7 @@ import React, { Component } from 'react';
import Welcome from './lib/welcome'; import Welcome from './lib/welcome';
import { alphabetiseAssociations } from '~/logic/lib/util'; 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'; import { GroupItem } from './lib/group-item';
export class Sidebar extends Component { export class Sidebar extends Component {

View File

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