ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into release/1.8.1

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/assets/styles/account.less
View File

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

2
client/assets/styles/controls.less
View File

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

3
client/assets/styles/game.less
View File

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

2
client/assets/styles/instance.less
View File

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

2
client/assets/styles/instance.mobile.less
View File

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

2
client/assets/styles/menu.less
View File

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

2
client/assets/styles/player.less
View File

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

2
client/assets/styles/vbox.less
View File

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

2
client/src/components/mnml.jsx
View File

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