diff --git a/acp/acp.js b/acp/acp.js index 0f4b8299..03ee6846 100644 --- a/acp/acp.js +++ b/acp/acp.js @@ -12,7 +12,7 @@ require('./../client/assets/styles/instance.less'); require('./../client/assets/styles/vbox.less'); require('./../client/assets/styles/game.less'); require('./../client/assets/styles/styles.mobile.css'); -require('./../client/assets/styles/instance.mobile.css'); +require('./../client/assets/styles/instance.mobile.less'); // kick it off require('./src/acp'); diff --git a/bin/client.sh b/bin/client.sh index 922b77d3..2ae62d06 100755 --- a/bin/client.sh +++ b/bin/client.sh @@ -13,9 +13,9 @@ rm -rf dist npm i npm run build -echo "Building acp version $VERSION" -cd $MNML_PATH/acp -rm -rf dist -npm i -npm run build -mv dist/* $MNML_PATH/client/dist/ +# echo "Building acp version $VERSION" +# cd $MNML_PATH/acp +# rm -rf dist +# npm i +# npm run build +# mv dist/* $MNML_PATH/client/dist/ diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less index 004ffef9..2a1d8451 100644 --- a/client/assets/styles/styles.less +++ b/client/assets/styles/styles.less @@ -23,7 +23,7 @@ html body { /* stops inspector going skitz*/ overflow-x: hidden; - overflow-y: hidden; + // overflow-y: hidden; } @media (min-width: 1921px) { diff --git a/client/assets/styles/styles.mobile.css b/client/assets/styles/styles.mobile.css index 1eb5963d..ec43c8d2 100644 --- a/client/assets/styles/styles.mobile.css +++ b/client/assets/styles/styles.mobile.css @@ -1,14 +1,16 @@ @media (max-width: 800px) { - #mnml { font-size: 12pt; padding: 0; grid-template-columns: 1fr; grid-template-rows: 1fr min-content; - /*overflow-y: scroll;*/ grid-template-areas: "main" "footer"; + + height: 100vh; + max-height: initial; + min-height: initial; } #mnml button { @@ -52,6 +54,8 @@ */ main { overflow-x: hidden; + overflow-y: initial; + max-height: 100vh; padding: 0 0.5em; } diff --git a/client/src/components/instance.component.jsx b/client/src/components/instance.component.jsx index 864bf9e2..0da7dced 100644 --- a/client/src/components/instance.component.jsx +++ b/client/src/components/instance.component.jsx @@ -71,8 +71,12 @@ class Instance extends Component { clearItems(); } + function onTouchMove(e) { + e.preventDefault(); + } + return ( -
setInfo(null)} > +
setInfo(null)} onTouchMove={onTouchMove}> diff --git a/client/src/components/welcome.jsx b/client/src/components/welcome.jsx index 70bde16d..6146b7a0 100644 --- a/client/src/components/welcome.jsx +++ b/client/src/components/welcome.jsx @@ -19,7 +19,7 @@ function Welcome() { }; return ( -
+