proper sizing for chat components

master
f0x 5 years ago
parent a58f183c21
commit bc0f8e6c54

@ -85,9 +85,7 @@ let App = create({
return ( return (
<> <>
<Sidebar client={this.state.client} rooms={this.state.rooms} selectRoom={(roomId) => {this.setState({roomId: roomId})}}/> <Sidebar client={this.state.client} rooms={this.state.rooms} selectRoom={(roomId) => {this.setState({roomId: roomId})}}/>
<div className="main"> <Chat client={this.state.client} roomId={this.state.roomId}/>
<Chat client={this.state.client} roomId={this.state.roomId}/>
</div>
</> </>
) )
} }

@ -57,9 +57,7 @@ let chat = create({
render: function() { render: function() {
let empty = ( let empty = (
<div className="chat" ref={this.setRef}> <div className="main">
<div className="events">
</div>
</div> </div>
) )
if (this.props.roomId == undefined) { if (this.props.roomId == undefined) {
@ -106,15 +104,15 @@ let chat = create({
} }
//TODO: replace with something that only renders events in view //TODO: replace with something that only renders events in view
return ( return (
<> <div className="main">
<Info room={room} /> <Info room={room} />
<div className="chat" ref={this.setRef}> <div className="chat" ref={this.setRef}>
<div className="events"> <div className="events">
{events} {events}
</div> </div>
</div> </div>
<Input client={this.state.client} roomId={this.state.roomId}/> <Input client={this.props.client} roomId={this.props.roomId}/>
</> </div>
) )
} }
}) })

@ -52,9 +52,7 @@ let FilterList = create({
return React.createElement(this.props.element, props) return React.createElement(this.props.element, props)
}) })
return <> return <>
<div className="filter"> <input className="filter" ref={this.inputRef} placeholder="Search"/>
<input ref={this.inputRef} placeholder="Search"/>
</div>
<div className="list"> <div className="list">
{items} {items}
</div> </div>

@ -183,18 +183,15 @@ body {
max-width: 15vw; max-width: 15vw;
.filter { .filter {
border: none;
border-bottom: $borderwidth solid $bg; border-bottom: $borderwidth solid $bg;
width: 100%;
input { box-sizing: border-box;
width: 100%; padding: $spacing;
box-sizing: border-box; color: white;
padding: $spacing; font-size: 1rem;
border: none; margin: 0;
color: white; font-weight: bold;
font-size: 1rem;
margin: 0;
font-weight: bold;
}
} }
} }
@ -253,14 +250,16 @@ body {
.info { .info {
padding: $spacing; padding: $spacing;
color: $accent; color: $accent;
font-size: 1rem;
font-weight: bold; font-weight: bold;
border-bottom: $borderwidth solid $bg; border-bottom: $borderwidth solid $bg;
box-sizing: border-box; box-sizing: border-box;
} }
.chat { .chat {
padding: $spacing; padding: 0 $spacing;
position: relative; position: relative;
box-sizing: border-box;
.events { .events {
display: flex; display: flex;
@ -291,9 +290,9 @@ body {
border: 0.2rem solid lighten($bg0, 10); border: 0.2rem solid lighten($bg0, 10);
position: sticky; position: sticky;
top: $spacing/4 - 0.2rem; top: $spacing;
//align-self: flex-end; //align-self: flex-end;
//bottom: $spacing/4 - 0.2rem; //bottom: $spacing;
} }
.col { .col {

Loading…
Cancel
Save