Fixed problem with web layout while using virtual keyboard

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3dc45492c2c77dcdb01b7b2528f3ff544ac3a49..dcc986fbf61ee2dda214655c5680acdf4e258502 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Buildbotics CNC Controller Firmware Changelog
  - Fixed error setting lower soft limit with virtual keyboard installed. #249
  - Fix numerical overflow causing long (time) linear moves to fail. #258
  - Better gamepad handling
+ - Fixed problem with web layout while using virtual keyboard
 
 ## v0.4.16
  - Improved axis under/over warning tooltip.

diff --git a/src/stylus/color-picker.styl b/src/stylus/color-picker.styl
index 916c06160ce9be0a6dd867997e8cf5f7168c1af1..388a976b5f33e6bfe33981e2e542a00d71bb6854 100644 (file)
--- a/src/stylus/color-picker.styl
+++ b/src/stylus/color-picker.styl
@@ -3,6 +3,7 @@
   width 1.5em
   border 1px solid #aaa
   cursor pointer
+  overflow hidden
 
   input
     opacity 0

diff --git a/src/stylus/main.styl b/src/stylus/main.styl
index 62d8fa81ba0084e94a17c145c1b062786f1d2a90..fc84380492ef27f7516743f99fc749855556b88c 100644 (file)
--- a/src/stylus/main.styl
+++ b/src/stylus/main.styl
@@ -1,6 +1,10 @@
 #main
   overflow-y scroll
-  height 100vh
+  position fixed
+  top 0
+  right 0
+  left 150px
+  bottom 0
   display flex
   flex-direction column
 
@@ -29,3 +33,7 @@
         padding 0.7em 1em
         border-radius 3px
         display inline-block
+
+@media (max-width: 48em)
+  #main
+    left 0