prevent scrolling when scaling decals

avsilva · Aug 6, 2021 · 694ca11 · 694ca11
1 parent 478d638
commit 694ca11
Show file tree

Hide file tree

Showing 11 changed files with 123 additions and 57 deletions.
diff --git a/src/app.module.css b/src/app.module.css
@@ -16,6 +16,7 @@
 .main {
     box-shadow: 0 3px 7px rgba(0, 0, 0, 0.342);
     overflow: hidden;
+    height: fit-content;
 }
 .controlPanelWrapper {
     margin-left: 15px;

diff --git a/src/assets/keys/keyDown.svg b/src/assets/keys/keyDown.svg
diff --git a/src/assets/keys/keyEsc.svg b/src/assets/keys/keyEsc.svg
diff --git a/src/assets/keys/keyEscRed.svg b/src/assets/keys/keyEscRed.svg
diff --git a/src/assets/keys/keyR.svg b/src/assets/keys/keyR.svg
diff --git a/src/assets/keys/keyUp.svg b/src/assets/keys/keyUp.svg
diff --git a/src/components/controlPanel/ControlPanel.js b/src/components/controlPanel/ControlPanel.js
@@ -166,32 +166,13 @@ export default function ControlPanel() {
                         setColor={setBackgroundColor}
                     />
                 </Card>
-                {decalPath && (
-                    <Card title="Hotkeys">
-                        <IconWithText
-                            imgSrc={keyR}
-                            imgAlt="rotate"
-                            textContent="Rotate"
-                        />
-                        <>
-                            <IconWithText
-                                imgSrc={keyUp}
-                                imgAlt="up"
-                                textContent="Scale up"
-                            />
-                            <IconWithText
-                                imgSrc={keyDown}
-                                imgAlt="down"
-                                textContent="Scale down"
-                            />
-                            <IconWithText
-                                imgSrc={keyEscRed}
-                                imgAlt="Esc"
-                                textContent="Cancel"
-                            />
-                        </>
-                    </Card>
-                )}
+                <Card title="Hotkeys">
+                    <IconWithText
+                        imgSrc={keyR}
+                        imgAlt="rotate"
+                        textContent="Rotate"
+                    />
+                </Card>
                 {decals.length > 0 && (
                     <Card title="Decals">
                         <DecalManager />

diff --git a/src/components/iconWithText/iconWithText.module.css b/src/components/iconWithText/iconWithText.module.css
@@ -2,7 +2,7 @@
     max-width: 40px;
 }
 .text {
-    color: grey;
+    color: black;
     margin: 0 10px;
 }
 .wrapper {