From 859312184cb960b25f4b04f7aa99385cf46ea74a Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Fri, 27 Jul 2018 23:46:29 +0000
Subject: [PATCH] Fix up bottom HUD
---
src/assets/stylesheets/2d-hud.scss | 9 ++++++++-
src/assets/stylesheets/info-dialog.scss | 1 +
src/assets/stylesheets/shared.scss | 3 +--
src/react-components/ui-root.js | 5 +++--
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/assets/stylesheets/2d-hud.scss b/src/assets/stylesheets/2d-hud.scss
index 1109316b6..edc8b3919 100644
--- a/src/assets/stylesheets/2d-hud.scss
+++ b/src/assets/stylesheets/2d-hud.scss
@@ -2,13 +2,20 @@
:local(.container) {
position: absolute;
- top: 10px;
display: flex;
justify-content: center;
align-items: center;
height: 80px;
width: 100%;
user-select: none;
+
+ &:local(.top) {
+ top: 10px;
+ }
+
+ &:local(.bottom) {
+ bottom: 20px;
+ }
}
:local(.panel) {
diff --git a/src/assets/stylesheets/info-dialog.scss b/src/assets/stylesheets/info-dialog.scss
index de78482ea..953f375a6 100644
--- a/src/assets/stylesheets/info-dialog.scss
+++ b/src/assets/stylesheets/info-dialog.scss
@@ -45,6 +45,7 @@
flex-direction: column;
height: 100%;
overflow-y: auto;
+ margin: 10px 0;
a { color: white }
}
diff --git a/src/assets/stylesheets/shared.scss b/src/assets/stylesheets/shared.scss
index b456c5c4e..62fc13268 100644
--- a/src/assets/stylesheets/shared.scss
+++ b/src/assets/stylesheets/shared.scss
@@ -52,8 +52,7 @@ $darkest-grey: rgba(32, 32, 32, 1.0);
%bottom-button {
@extend %action-button;
- margin-top: auto;
- margin-bottom: 24px;
+ margin-top: 16px;
}
%action-button {
diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
index 5352646ed..33cbfaeda 100644
--- a/src/react-components/ui-root.js
+++ b/src/react-components/ui-root.js
@@ -22,7 +22,6 @@ import { ProfileInfoHeader } from "./profile-info-header.js";
import ProfileEntryPanel from "./profile-entry-panel";
import InfoDialog from "./info-dialog.js";
import TwoDHUD from "./2d-hud";
-import Footer from "./footer";
import { faUsers } from "@fortawesome/free-solid-svg-icons/faUsers";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -901,7 +900,9 @@ class UIRoot extends Component {
</button>
</div>
)}
- <Footer onClickCreate={() => this.setState({ infoDialogType: InfoDialog.dialogTypes.create_object })} />
+ <TwoDHUD.BottomHUD
+ onCreateObject={() => this.setState({ infoDialogType: InfoDialog.dialogTypes.create_object })}
+ />
</div>
) : null}
</div>
--
GitLab