Merge branch 'develop' into release/1.8.1

This commit is contained in:
ntr 2019-11-09 12:57:53 +11:00
commit fc4c3259a7
10 changed files with 1 additions and 20 deletions

View File

@ -1,5 +1,3 @@
@import 'colours.less';
.account {
grid-template-columns: 1fr 1fr 1fr 1fr;

View File

@ -1,5 +1,3 @@
@import 'colours.less';
aside {
grid-area: ctrl;
display: grid;

View File

@ -1,6 +1,3 @@
@import 'colours.less';
/* GAME */
.game {
overflow: hidden;
// display: grid;

View File

@ -1,5 +1,3 @@
@import 'colours.less';
.instance {
overflow: hidden;
display: grid;

View File

@ -1,5 +1,3 @@
@import 'colours.less';
// tablet / ipad
@media (max-width: 1100px) {
.instance {

View File

@ -1,5 +1,3 @@
@import 'colours.less';
.menu {
height: 100%;
display: grid;

View File

@ -1,5 +1,3 @@
@import 'colours.less';
.player-box {
display: grid;
overflow: hidden;

View File

@ -1,5 +1,3 @@
@import 'colours.less';
.vbox {
margin-bottom: 2em;

View File

@ -4,7 +4,6 @@ const { connect } = require('preact-redux');
const Main = require('./main');
// const Nav = require('./nav');
const Controls = require('./controls');
const Footer = require('./footer');
const addState = connect(
({ game, instance }) => ({ game, instance })
@ -24,7 +23,6 @@ function Mnml(args) {
<div id="mnml">
<Main />
<Controls />
<Footer />
<div id="rotate" class={rotateClass} >
</div>
</div>