From de205aae426aadd6e5020ee71be7d73b994d559e Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Mon, 1 Oct 2018 06:34:12 +0000
Subject: [PATCH] Fixes
---
src/assets/stylesheets/info-dialog.scss | 3 ++-
src/react-components/ui-root.js | 23 ++++++++++++-----------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/assets/stylesheets/info-dialog.scss b/src/assets/stylesheets/info-dialog.scss
index eebc5bf54..6e82b7450 100644
--- a/src/assets/stylesheets/info-dialog.scss
+++ b/src/assets/stylesheets/info-dialog.scss
@@ -14,6 +14,7 @@
grid-template-rows: 1fr 20px minmax(200px, max-content) 20px 1fr;
width: 100%;
height: 100%;
+ background-color: rgba(0,0,0,.2);
&__box {
grid-column: 3;
@@ -61,7 +62,7 @@
&__close {
position: absolute;
- left: 12px;
+ right: 12px;
top: 6px;
color: white;
font-size: 1.4em;
diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
index 2b382f353..df6effcb3 100644
--- a/src/react-components/ui-root.js
+++ b/src/react-components/ui-root.js
@@ -929,17 +929,6 @@ class UIRoot extends Component {
<div className={styles.ui}>
{this.state.dialog}
- <button onClick={() => this.showHelpDialog()} className={styles.helpIcon}>
- <i>
- <FontAwesomeIcon icon={faQuestion} />
- </i>
- </button>
-
- <div className={styles.presenceInfo}>
- <FontAwesomeIcon icon={faUsers} />
- <span className={styles.occupantCount}>{this.props.occupantCount || "-"}</span>
- </div>
-
{this.state.showProfileEntry && (
<ProfileEntryPanel finished={this.onProfileFinished} store={this.props.store} />
)}
@@ -971,6 +960,18 @@ class UIRoot extends Component {
)}
</div>
)}
+
+ <button onClick={() => this.showHelpDialog()} className={styles.helpIcon}>
+ <i>
+ <FontAwesomeIcon icon={faQuestion} />
+ </i>
+ </button>
+
+ <div className={styles.presenceInfo}>
+ <FontAwesomeIcon icon={faUsers} />
+ <span className={styles.occupantCount}>{this.props.occupantCount || "-"}</span>
+ </div>
+
{this.state.entryStep === ENTRY_STEPS.finished ? (
<div>
<TwoDHUD.TopHUD
--
GitLab