This commit is contained in:
ntr 2019-05-14 16:12:04 +10:00
parent 9af2e8717f
commit 6774b5cfcf
3 changed files with 18 additions and 56 deletions

View File

@ -7,12 +7,12 @@
grid-template-columns: repeat(12, 1fr); grid-template-columns: repeat(12, 1fr);
grid-template-rows: repeat(11, 1fr); grid-template-rows: repeat(11, 1fr);
grid-template-areas: grid-template-areas:
"n v v v v v v v v i i i" "n n n n n n n n n n n n"
"n v v v v v v v v i i i" "v v v v v v v v v i i i"
"n v v v v v v v v i i i" "v v v v v v v v v i i i"
"n v v v v v v v v i i i" "v v v v v v v v v i i i"
"n e e e e e e e e e e e" "e e e e e e e e e e e e"
"n e e e e e e e e e e e" "c c c c c c c c c c c c"
"c c c c c c c c c c c c" "c c c c c c c c c c c c"
"c c c c c c c c c c c c" "c c c c c c c c c c c c"
"c c c c c c c c c c c c" "c c c c c c c c c c c c"
@ -24,9 +24,7 @@
grid-area: n; grid-area: n;
display: flex; display: flex;
flex-flow: column; flex-flow: column;
flex: 0 0 100%; flex: 1;
padding-top: 50px;
padding-right: 20px;
} }
.instance-info { .instance-info {
@ -42,7 +40,6 @@
.vbox { .vbox {
grid-area: v; grid-area: v;
display: flex; display: flex;
justify-content: flex-end;
} }
.vbox-box { .vbox-box {
@ -168,11 +165,7 @@
flex: 1 1 auto; flex: 1 1 auto;
display: flex; display: flex;
flex-flow: row; flex-flow: row;
padding: 0 2em 0 2em;
align-content: flex-start;
justify-content: center;
min-width: 300px; min-width: 300px;
overflow: hidden; overflow: hidden;
} }
@ -196,6 +189,10 @@
transition-timing-function: ease; transition-timing-function: ease;
} }
.instance-cryp:first-child {
margin-left: 0;
}
.instance-cryp .avatar { .instance-cryp .avatar {
grid-area: av; grid-area: av;
display: flex; display: flex;

View File

@ -16,40 +16,7 @@ function InstanceComponent(args) {
setVboxHidden, setVboxHidden,
} = args; } = args;
if (!instance) return <div>...</div>; if (!instance) return false;
function toggleVbox(e) {
setVboxHidden(!vboxHidden);
e.stopPropagation();
}
const vboxBtn = (
<button
className="instance-btn instance-ui-btn nav-btn left"
onClick={toggleVbox}>
vBox
</button>
);
const teamBtn = (
<button
className="instance-btn instance-ui-btn nav-btn right"
onClick={toggleVbox}>
team
</button>
);
const navBtn = vboxHidden
? vboxBtn
: teamBtn;
const menuBtn = (
<button
className="instance-btn instance-ui-btn menu-btn left"
onClick={quit}>
menu
</button>
);
const rdyClasses = `instance-btn instance-ui-btn ready-btn ${player.ready ? 'ready' : ''}`; const rdyClasses = `instance-btn instance-ui-btn ready-btn ${player.ready ? 'ready' : ''}`;
const readyBtn = ( const readyBtn = (
@ -83,11 +50,6 @@ function InstanceComponent(args) {
return ( return (
<section className="instance" > <section className="instance" >
<div className="instance-hdr"> <div className="instance-hdr">
{navBtn}
{menuBtn}
<div className="spacer">
<div>&nbsp;</div>
</div>
{actionBtn} {actionBtn}
{timer} {timer}
</div> </div>

View File

@ -59,6 +59,9 @@ document.fonts.load('16pt "Jura"').then(() => {
<Header /> <Header />
<nav> <nav>
<h2>Team</h2> <h2>Team</h2>
<button>zzz</button>
<button>muji</button>
<button>kaast</button>
<h2>Instances</h2> <h2>Instances</h2>
<button> <button>
six six