diff options
author | JoramWilander <jwawilander@gmail.com> | 2015-11-02 15:10:46 -0500 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2015-11-02 15:10:46 -0500 |
commit | 35b11e0e61fd3c7130c3f54601ba05dd0b52fba3 (patch) | |
tree | bc35ac95c1012e9e15c989fc895a694bfa971ee4 /web/react/components/tutorial | |
parent | 95da41257155e4d1d8201471e7ae1f5d96450189 (diff) | |
download | chat-35b11e0e61fd3c7130c3f54601ba05dd0b52fba3.tar.gz chat-35b11e0e61fd3c7130c3f54601ba05dd0b52fba3.tar.bz2 chat-35b11e0e61fd3c7130c3f54601ba05dd0b52fba3.zip |
Fix merge issues
Diffstat (limited to 'web/react/components/tutorial')
-rw-r--r-- | web/react/components/tutorial/tutorial_intro_screens.jsx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/web/react/components/tutorial/tutorial_intro_screens.jsx b/web/react/components/tutorial/tutorial_intro_screens.jsx index 0f3050156..c7abccae3 100644 --- a/web/react/components/tutorial/tutorial_intro_screens.jsx +++ b/web/react/components/tutorial/tutorial_intro_screens.jsx @@ -20,10 +20,6 @@ export default class TutorialIntroScreens extends React.Component { this.state = {currentScreen: 0}; } - componentDidMount() { - const height = $(window).outerHeight() - 120; - $('.tutorial-steps__container').css('height', `${height}px`); - } handleNext() { if (this.state.currentScreen < 2) { this.setState({currentScreen: this.state.currentScreen + 1}); |