Merge branch 'mp/chat-design-tweak' (#2049)

* mp/chat-design-tweak:
  chat: chat tab bar re-aligned and resized

Signed-off-by: Jared Tobin <jared@tlon.io>
This commit is contained in:
Jared Tobin 2019-12-07 16:55:29 +08:00
commit dc45806e99
No known key found for this signature in database
GPG Key ID: 0E4647D58F8A69E4
7 changed files with 25 additions and 22 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -231,15 +231,16 @@ export class ChatScreen extends Component {
<Link to="/~chat/">{"⟵ All Chats"}</Link> <Link to="/~chat/">{"⟵ All Chats"}</Link>
</div> </div>
<div <div
className="pl3 pt4 bb b--gray4 flex relative overflow-x-scroll overflow-x-auto-l overflow-x-auto-xl flex-shrink-0" className="pl3 pt2 bb b--gray4 flex relative overflow-x-scroll overflow-x-auto-l overflow-x-auto-xl flex-shrink-0"
style={{ height: 48 }}> style={{ height: 48 }}>
<SidebarSwitcher <SidebarSwitcher
sidebarShown={this.props.sidebarShown} sidebarShown={this.props.sidebarShown}
popout={this.props.popout} popout={this.props.popout}
/> />
<Link to={`/~chat/` + isinPopout + `room` + state.station}> <Link to={`/~chat/` + isinPopout + `room` + state.station}
className="pt2">
<h2 <h2
className="mono dib f7 fw4 v-top" className="mono dib f8 fw4 v-top"
style={{ width: "max-content" }}> style={{ width: "max-content" }}>
{state.station.substr(1)} {state.station.substr(1)}
</h2> </h2>

View File

@ -33,11 +33,11 @@ export class ChatTabBar extends Component {
return ( return (
<div className="dib flex-shrink-0 flex-grow-1"> <div className="dib pt2 flex-shrink-0 flex-grow-1">
{!!props.isOwner ? ( {!!props.isOwner ? (
<div className={"dib f8 pl6"}> <div className={"dib f8 pl6"}>
<Link <Link
className={"no-underline v-top " + memColor} className={"no-underline " + memColor}
to={`/~chat/` + popout + `members` + props.station}> to={`/~chat/` + popout + `members` + props.station}>
Members Members
</Link> </Link>
@ -47,7 +47,7 @@ export class ChatTabBar extends Component {
)} )}
<div className={"dib f8 pl6 pr6"}> <div className={"dib f8 pl6 pr6"}>
<Link <Link
className={"no-underline v-top " + setColor} className={"no-underline " + setColor}
to={`/~chat/` + popout + `settings` + props.station}> to={`/~chat/` + popout + `settings` + props.station}>
Settings Settings
</Link> </Link>
@ -55,11 +55,10 @@ export class ChatTabBar extends Component {
<a href={`/~chat/popout/room` + props.station} target="_blank" <a href={`/~chat/popout/room` + props.station} target="_blank"
className="dib fr"> className="dib fr">
<img <img
className={`v-btm flex-shrink-0 pr2 dn ` + hidePopoutIcon} className={`flex-shrink-0 pr2 dn ` + hidePopoutIcon}
src="/~chat/img/popout.png" src="/~chat/img/popout.png"
height="16" height="16"
width="16" width="16"/>
style={{ paddingTop: "2px" }}/>
</a> </a>
</div> </div>
); );

View File

@ -9,14 +9,14 @@ export class SidebarSwitcher extends Component {
: "dib-m dib-l dib-xl"; : "dib-m dib-l dib-xl";
return ( return (
<div> <div className="pt2">
<a <a
className="pointer flex-shrink-0" className="pointer flex-shrink-0"
onClick={() => { onClick={() => {
api.sidebarToggle(); api.sidebarToggle();
}}> }}>
<img <img
className={`v-btm pr3 dn ` + popoutSwitcher} className={`pr3 dn ` + popoutSwitcher}
src={ src={
this.props.sidebarShown this.props.sidebarShown
? "/~chat/img/ChatSwitcherLink.png" ? "/~chat/img/ChatSwitcherLink.png"

View File

@ -83,15 +83,16 @@ export class MemberScreen extends Component {
<Link to="/~chat/">{"⟵ All Chats"}</Link> <Link to="/~chat/">{"⟵ All Chats"}</Link>
</div> </div>
<div <div
className="pl3 pt4 bb b--gray4 flex relative overflow-x-scroll overflow-x-auto-l overflow-x-auto-xl flex-shrink-0" className="pl3 pt2 bb b--gray4 flex relative overflow-x-scroll overflow-x-auto-l overflow-x-auto-xl flex-shrink-0"
style={{ height: 48 }}> style={{ height: 48 }}>
<SidebarSwitcher <SidebarSwitcher
sidebarShown={this.props.sidebarShown} sidebarShown={this.props.sidebarShown}
popout={this.props.popout} popout={this.props.popout}
/> />
<Link to={`/~chat/` + isinPopout + `room` + state.station}> <Link to={`/~chat/` + isinPopout + `room` + state.station}
className="pt2">
<h2 <h2
className="mono dib f7 fw4 v-top" className="mono dib f8 fw4 v-top"
style={{ width: "max-content" }}> style={{ width: "max-content" }}>
{state.station.substr(1)} {state.station.substr(1)}
</h2> </h2>

View File

@ -90,15 +90,16 @@ export class SettingsScreen extends Component {
<Link to="/~chat/">{"⟵ All Chats"}</Link> <Link to="/~chat/">{"⟵ All Chats"}</Link>
</div> </div>
<div <div
className="pl3 pt4 bb b--gray4 flex relative overflow-x-scroll overflow-x-auto-l overflow-x-auto-xl flex-shrink-0" className="pl3 pt2 bb b--gray4 flex relative overflow-x-scroll overflow-x-auto-l overflow-x-auto-xl flex-shrink-0"
style={{ height: 48 }}> style={{ height: 48 }}>
<SidebarSwitcher <SidebarSwitcher
sidebarShown={this.props.sidebarShown} sidebarShown={this.props.sidebarShown}
popout={this.props.popout} popout={this.props.popout}
/> />
<Link to={`/~chat/` + isinPopout + `room` + state.station}> <Link to={`/~chat/` + isinPopout + `room` + state.station}
className="pt2">
<h2 <h2
className="mono dib f7 fw4 v-top" className="mono dib f8 fw4 v-top"
style={{ width: "max-content" }}> style={{ width: "max-content" }}>
{state.station.substr(1)} {state.station.substr(1)}
</h2> </h2>
@ -124,15 +125,16 @@ export class SettingsScreen extends Component {
<Link to="/~chat/">{"⟵ All Chats"}</Link> <Link to="/~chat/">{"⟵ All Chats"}</Link>
</div> </div>
<div <div
className="pl3 pt4 bb b--gray4 flex relative overflow-x-scroll overflow-x-auto-l overflow-x-auto-xl flex-shrink-0" className="pl3 pt2 bb b--gray4 flex relative overflow-x-scroll overflow-x-auto-l overflow-x-auto-xl flex-shrink-0"
style={{ height: 48 }}> style={{ height: 48 }}>
<SidebarSwitcher <SidebarSwitcher
sidebarShown={this.props.sidebarShown} sidebarShown={this.props.sidebarShown}
popout={this.props.popout} popout={this.props.popout}
/> />
<Link to={`/~chat/` + isinPopout + `room` + state.station}> <Link to={`/~chat/` + isinPopout + `room` + state.station}
className="pt2">
<h2 <h2
className="mono dib f7 fw4 v-top" className="mono dib f8 fw4 v-top"
style={{ width: "max-content" }}> style={{ width: "max-content" }}>
{state.station.substr(1)} {state.station.substr(1)}
</h2> </h2>