From 80f7c33f13787f7a3a68de09a23969598655cc7d Mon Sep 17 00:00:00 2001 From: Greg Fodor <gfodor@gmail.com> Date: Sat, 28 Jul 2018 00:41:52 +0000 Subject: [PATCH] Cleanup --- src/assets/stylesheets/entry.scss | 2 ++ src/react-components/ui-root.js | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/assets/stylesheets/entry.scss b/src/assets/stylesheets/entry.scss index 6dcd41564..5dc16221c 100644 --- a/src/assets/stylesheets/entry.scss +++ b/src/assets/stylesheets/entry.scss @@ -53,6 +53,7 @@ :local(.button-container) { margin: auto; + margin-top: -72px; text-align: center; flex: 10; display: flex; @@ -64,6 +65,7 @@ @extend %action-button; align-self: center; width: 75%; + margin-top: 28px; } :local(.presence-info) { diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js index 33cbfaeda..f1584d683 100644 --- a/src/react-components/ui-root.js +++ b/src/react-components/ui-root.js @@ -643,12 +643,6 @@ class UIRoot extends Component { <span className={entryStyles.people}>2 people</span> have joined </div> )} - <button - className={entryStyles.inviteButton} - onClick={() => this.setState({ infoDialogType: InfoDialog.dialogTypes.invite })} - > - <FormattedMessage id="entry.invite-others" /> - </button> {this.props.availableVREntryTypes.screen === VR_DEVICE_AVAILABILITY.yes && ( <TwoDEntryButton onClick={this.enter2D} /> )} @@ -675,6 +669,12 @@ class UIRoot extends Component { </div> )} {screenSharingCheckbox} + <button + className={entryStyles.inviteButton} + onClick={() => this.setState({ infoDialogType: InfoDialog.dialogTypes.invite })} + > + <FormattedMessage id="entry.invite-others" /> + </button> </div> </div> ) : null; -- GitLab