summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-11-02 09:21:08 -0500
committerJoramWilander <jwawilander@gmail.com>2015-11-02 14:47:24 -0500
commitdedbc122c666a68de4759be7b7c70e698e3e2c28 (patch)
tree72d49acce0b7c24c9aab4cbe0b1434db4299784f /web/react
parent393d253021e6b119ec35b92f9eeaa6f2d255008f (diff)
downloadchat-dedbc122c666a68de4759be7b7c70e698e3e2c28.tar.gz
chat-dedbc122c666a68de4759be7b7c70e698e3e2c28.tar.bz2
chat-dedbc122c666a68de4759be7b7c70e698e3e2c28.zip
Overlay fixes and added class prop for tips
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/create_post.jsx1
-rw-r--r--web/react/components/sidebar.jsx1
-rw-r--r--web/react/components/sidebar_header.jsx3
-rw-r--r--web/react/components/tutorial/tutorial_tip.jsx15
4 files changed, 16 insertions, 4 deletions
diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index cb3148b7b..1545cdfaa 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -393,6 +393,7 @@ export default class CreatePost extends React.Component {
<TutorialTip
placement='top'
screens={screens}
+ overlayClass='tip-overlay--chat'
/>
);
}
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 39d9808e9..c47919885 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -358,6 +358,7 @@ export default class Sidebar extends React.Component {
<TutorialTip
placement='right'
screens={screens}
+ overlayClass='tip-overlay--sidebar'
/>
);
}
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index 96348f688..0d48c6f88 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -44,8 +44,6 @@ export default class SidebarHeader extends React.Component {
this.refs.dropdown.blockToggle = false;
return;
}
- console.log(this.refs.tip);
- this.refs.tip.toggle();
$('.team__header').find('.dropdown-toggle').dropdown('toggle');
}
createTutorialTip() {
@@ -97,6 +95,7 @@ export default class SidebarHeader extends React.Component {
ref='tip'
placement='right'
screens={screens}
+ overlayClass='tip-overlay--sidebar'
/>
</div>
);
diff --git a/web/react/components/tutorial/tutorial_tip.jsx b/web/react/components/tutorial/tutorial_tip.jsx
index 3482a7cfa..118209599 100644
--- a/web/react/components/tutorial/tutorial_tip.jsx
+++ b/web/react/components/tutorial/tutorial_tip.jsx
@@ -80,13 +80,19 @@ export default class TutorialTip extends React.Component {
/>
<Overlay
+ show={this.state.show}
+ >
+ <div className='tip-backdrop'/>
+ </Overlay>
+
+ <Overlay
placement={this.props.placement}
show={this.state.show}
rootClose={true}
onHide={this.toggle}
target={() => this.refs.target}
>
- <div className='tip-overlay'>
+ <div className={'tip-overlay ' + this.props.overlayClass}>
{this.props.screens[this.state.currentScreen]}
<div className='tutorial__circles'>{dots}</div>
<div className='text-right'>
@@ -113,7 +119,12 @@ export default class TutorialTip extends React.Component {
}
}
+TutorialTip.defaultProps = {
+ overlayClass: ''
+};
+
TutorialTip.propTypes = {
screens: React.PropTypes.array.isRequired,
- placement: React.PropTypes.string.isRequired
+ placement: React.PropTypes.string.isRequired,
+ overlayClass: React.PropTypes.string
};