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

Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

Browse Source
This commit is contained in:
Mashy 2019-10-21 19:41:55 +10:00
commit 36c9236842
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WORKLOG.md
View File

@ -4,7 +4,7 @@
*PRODUCTION* *PRODUCTION*
* rename vbox to shop (just for display) * rename vbox to shop (just for display)
* give the shop and inventory distinct delineation * give the shop and inventory distinct delineation
* proper victory / lose page instead of just face off (you are the winner or something) * proper victory / lose page instead of just face off (you are the winner or something)
* vbox phase skill list navigator (overlay maybe?) * vbox phase skill list navigator (overlay maybe?)
@ -38,7 +38,7 @@
* remove names so games/instances are copy * remove names so games/instances are copy
*$$$* *$$$*
* chatwheel * instead of red noise, red and black bar gradient
* eth adapter * eth adapter
* illusions * illusions
* vaporwave * vaporwave

5
client/src/components/play.ctrl.jsx
View File

@ -66,9 +66,8 @@ function JoinButtons(args) {
<div class="timer-container"></div> <div class="timer-container"></div>
<div class="controls"> <div class="controls">
{discordBtn} {discordBtn}
<div class="flex"> <div></div>
<div>&nbsp;</div> <div></div>
</div>
<AccountBox /> <AccountBox />
<div class="instance-ctrl-btns"> <div class="instance-ctrl-btns">
<button disabled={true} >Chat</button> <button disabled={true} >Chat</button>