From d2d15f68d4dbd080ac9c28828c8546ef33b919e3 Mon Sep 17 00:00:00 2001
From: Moran T <morant@brainpop.com>
Date: Tue, 27 Feb 2018 15:13:23 +0200
Subject: [PATCH] Revert "Adding constraint on min height for large stage"
This reverts commit 0a741b1083cd7d1eaa482cab9284e421e03c061d.
---
src/components/gui/gui.jsx | 25 +++++++++-------------
src/components/sprite-info/sprite-info.jsx | 15 +++----------
src/lib/layout-constants.js | 1 -
3 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/src/components/gui/gui.jsx b/src/components/gui/gui.jsx
index c2d025dd7..5c7a378dc 100644
--- a/src/components/gui/gui.jsx
+++ b/src/components/gui/gui.jsx
@@ -144,21 +144,16 @@ const GUIComponent = props => {
</Box>
<Box className={styles.stageWrapper}>
{/* eslint-disable arrow-body-style */}
- <MediaQuery
- minHeight={layout.fullSizeMinHeight}
- minWidth={layout.fullSizeMinWidth}
- >
- {isFullSize => {
- return isRendererSupported ? (
- <Stage
- height={isFullSize ? layout.fullStageHeight : layout.smallerStageHeight}
- shrink={0}
- vm={vm}
- width={isFullSize ? layout.fullStageWidth : layout.smallerStageWidth}
- />
- ) : null;
- }}
- </MediaQuery>
+ <MediaQuery minWidth={layout.fullSizeMinWidth}>{isFullSize => {
+ return isRendererSupported ? (
+ <Stage
+ height={isFullSize ? layout.fullStageHeight : layout.smallerStageHeight}
+ shrink={0}
+ vm={vm}
+ width={isFullSize ? layout.fullStageWidth : layout.smallerStageWidth}
+ />
+ ) : null;
+ }}</MediaQuery>
{/* eslint-enable arrow-body-style */}
</Box>
<Box className={styles.targetWrapper}>
diff --git a/src/components/sprite-info/sprite-info.jsx b/src/components/sprite-info/sprite-info.jsx
index 32044e59d..7d0acf952 100644
--- a/src/components/sprite-info/sprite-info.jsx
+++ b/src/components/sprite-info/sprite-info.jsx
@@ -51,10 +51,7 @@ class SpriteInfo extends React.Component {
</div>
<div className={styles.group}>
- <MediaQuery
- minHeight={layout.fullSizeMinHeight}
- minWidth={layout.fullSizeMinWidth}
- >
+ <MediaQuery minWidth={layout.fullSizeMinWidth}>
<div className={styles.iconWrapper}>
<img
aria-hidden="true"
@@ -77,10 +74,7 @@ class SpriteInfo extends React.Component {
</div>
<div className={styles.group}>
- <MediaQuery
- minHeight={layout.fullSizeMinHeight}
- minWidth={layout.fullSizeMinWidth}
- >
+ <MediaQuery minWidth={layout.fullSizeMinWidth}>
<div className={styles.iconWrapper}>
<img
aria-hidden="true"
@@ -105,10 +99,7 @@ class SpriteInfo extends React.Component {
<div className={classNames(styles.row, styles.rowSecondary)}>
<div className={styles.group}>
- <MediaQuery
- minHeight={layout.fullSizeMinHeight}
- minWidth={layout.fullSizeMinWidth}
- >
+ <MediaQuery minWidth={layout.fullSizeMinWidth}>
<Label
secondary
text="Show"
diff --git a/src/lib/layout-constants.js b/src/lib/layout-constants.js
index 9c874613f..67c2ae44c 100644
--- a/src/lib/layout-constants.js
+++ b/src/lib/layout-constants.js
@@ -4,6 +4,5 @@ export default {
smallerStageWidth: 480 * 0.85,
smallerStageHeight: 360 * 0.85,
fullSizeMinWidth: 1096,
- fullSizeMinHeight: 821, // Adding 7% to 768.
fullSizePaintMinWidth: 1250
};
--
GitLab