fix map chat layout and tab bug
This commit is contained in:
parent
959a6837d8
commit
b09c876ea3
2 changed files with 18 additions and 6 deletions
|
@ -672,9 +672,21 @@ label {
|
||||||
position: relative;
|
position: relative;
|
||||||
/*overflow:hidden; */
|
/*overflow:hidden; */
|
||||||
}
|
}
|
||||||
.main.compressed {
|
.compressed {
|
||||||
width: calc(100% - 300px);
|
.upperRightUI {
|
||||||
|
right: 324px;
|
||||||
|
}
|
||||||
|
.upperRightMapButtons {
|
||||||
|
right: 434px;
|
||||||
|
}
|
||||||
|
.mapControls {
|
||||||
|
right: 324px;
|
||||||
|
}
|
||||||
|
.infoAndHelp {
|
||||||
|
right: 370px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#infovis-canvas {
|
#infovis-canvas {
|
||||||
-webkit-touch-callout: none;
|
-webkit-touch-callout: none;
|
||||||
-webkit-user-select: none;
|
-webkit-user-select: none;
|
||||||
|
|
|
@ -105,9 +105,9 @@ class MapChat extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
render = () => {
|
render = () => {
|
||||||
const rightOffset = this.props.chatOpen ? '0' : '-300px'
|
const { chatOpen, conversationLive, isParticipating, participants, messages, inviteACall, inviteToJoin } = this.props
|
||||||
const { conversationLive, isParticipating, participants, messages, inviteACall, inviteToJoin } = this.props
|
|
||||||
const { videosShowing, cursorsShowing, alertSound, unreadMessages } = this.state
|
const { videosShowing, cursorsShowing, alertSound, unreadMessages } = this.state
|
||||||
|
const rightOffset = chatOpen ? '0' : '-300px'
|
||||||
return (
|
return (
|
||||||
<div id="chat-box-wrapper">
|
<div id="chat-box-wrapper">
|
||||||
<div className="chat-box"
|
<div className="chat-box"
|
||||||
|
@ -148,7 +148,7 @@ class MapChat extends Component {
|
||||||
<div className="chat-messages" ref={div => { this.messagesDiv = div }}>
|
<div className="chat-messages" ref={div => { this.messagesDiv = div }}>
|
||||||
{makeList(messages)}
|
{makeList(messages)}
|
||||||
</div>
|
</div>
|
||||||
<NewMessage messageText={this.state.messageText}
|
{chatOpen && <NewMessage messageText={this.state.messageText}
|
||||||
focusMessageInput={this.focusMessageInput}
|
focusMessageInput={this.focusMessageInput}
|
||||||
handleChange={this.handleChange('messageText')}
|
handleChange={this.handleChange('messageText')}
|
||||||
textAreaProps={{
|
textAreaProps={{
|
||||||
|
@ -159,7 +159,7 @@ class MapChat extends Component {
|
||||||
onFocus: this.props.inputFocus,
|
onFocus: this.props.inputFocus,
|
||||||
onBlur: this.props.inputBlur
|
onBlur: this.props.inputBlur
|
||||||
}}
|
}}
|
||||||
/>
|
/>}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|
Loading…
Add table
Reference in a new issue