scrolling fix

This commit is contained in:
ntr 2019-09-24 14:32:37 +10:00
parent c19e8ac30e
commit 460a25c81a
6 changed files with 20 additions and 12 deletions

View File

@ -12,7 +12,7 @@ require('./../client/assets/styles/instance.less');
require('./../client/assets/styles/vbox.less'); require('./../client/assets/styles/vbox.less');
require('./../client/assets/styles/game.less'); require('./../client/assets/styles/game.less');
require('./../client/assets/styles/styles.mobile.css'); require('./../client/assets/styles/styles.mobile.css');
require('./../client/assets/styles/instance.mobile.css'); require('./../client/assets/styles/instance.mobile.less');
// kick it off // kick it off
require('./src/acp'); require('./src/acp');

View File

@ -13,9 +13,9 @@ rm -rf dist
npm i npm i
npm run build npm run build
echo "Building acp version $VERSION" # echo "Building acp version $VERSION"
cd $MNML_PATH/acp # cd $MNML_PATH/acp
rm -rf dist # rm -rf dist
npm i # npm i
npm run build # npm run build
mv dist/* $MNML_PATH/client/dist/ # mv dist/* $MNML_PATH/client/dist/

View File

@ -23,7 +23,7 @@ html body {
/* stops inspector going skitz*/ /* stops inspector going skitz*/
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; // overflow-y: hidden;
} }
@media (min-width: 1921px) { @media (min-width: 1921px) {

View File

@ -1,14 +1,16 @@
@media (max-width: 800px) { @media (max-width: 800px) {
#mnml { #mnml {
font-size: 12pt; font-size: 12pt;
padding: 0; padding: 0;
grid-template-columns: 1fr; grid-template-columns: 1fr;
grid-template-rows: 1fr min-content; grid-template-rows: 1fr min-content;
/*overflow-y: scroll;*/
grid-template-areas: grid-template-areas:
"main" "main"
"footer"; "footer";
height: 100vh;
max-height: initial;
min-height: initial;
} }
#mnml button { #mnml button {
@ -52,6 +54,8 @@
*/ */
main { main {
overflow-x: hidden; overflow-x: hidden;
overflow-y: initial;
max-height: 100vh;
padding: 0 0.5em; padding: 0 0.5em;
} }

View File

@ -71,8 +71,12 @@ class Instance extends Component {
clearItems(); clearItems();
} }
function onTouchMove(e) {
e.preventDefault();
}
return ( return (
<main id="instance" class='instance' onClick={instanceClick} onMouseOver={() => setInfo(null)} > <main id="instance" class='instance' onClick={instanceClick} onMouseOver={() => setInfo(null)} onTouchMove={onTouchMove}>
<Vbox /> <Vbox />
<InfoContainer /> <InfoContainer />
<InstanceConstructsContainer /> <InstanceConstructsContainer />

View File

@ -19,7 +19,7 @@ function Welcome() {
}; };
return ( return (
<main class="menu"> <main class="menu welcome">
<header> <header>
<div class="options"> <div class="options">
<button <button