it's ready

This commit is contained in:
ntr 2019-06-04 00:00:48 +10:00
parent 8561165eb3
commit dde6d28393
8 changed files with 12 additions and 22 deletions

View File

@ -3,10 +3,8 @@
.game { .game {
overflow: hidden; overflow: hidden;
display: grid; display: grid;
grid-template-rows: min-content min-content 1fr 0.5fr 1.5fr; grid-template-rows: 1fr 0.5fr 1.5fr;
grid-template-areas: grid-template-areas:
"ready"
"timer"
"opponent" "opponent"
"target" "target"
"player"; "player";
@ -73,12 +71,12 @@
transition-timing-function: ease; transition-timing-function: ease;
} }
.game #targeting { #targeting {
grid-area: target;
height: 100%; height: 100%;
width: 100%; width: 100%;
stroke-width: 2px; stroke-width: 2px;
stroke: whitesmoke; stroke: whitesmoke;
} }
/* some stupid bug in chrome makes it fill the entire screen */ /* some stupid bug in chrome makes it fill the entire screen */

View File

@ -37,12 +37,6 @@
grid-area: constructs; grid-area: constructs;
} }
.instance-ui-btn {
font-size: 100%;
padding: 0;
margin: 0;
}
.instance .info { .instance .info {
/*font-size: 75%;*/ /*font-size: 75%;*/
margin-left: 1em; margin-left: 1em;

View File

@ -67,21 +67,19 @@ figure {
} }
#mnml { #mnml {
padding: 0 2em;
display: grid; display: grid;
grid-template-columns: 1fr 8fr; grid-template-columns: 1fr 8fr;
grid-template-rows: min-content 1fr min-content; grid-template-rows: min-content 1fr min-content;
grid-template-areas: grid-template-areas:
"hd hd" "hd hd"
"nav main" "nav main"
"nav footer"; "footer footer";
} }
nav { nav {
grid-area: nav; grid-area: nav;
padding-left: 2em;
margin-right: 2em; margin-right: 2em;
overflow: hidden;
white-space: nowrap;
} }
nav h2:first-child { nav h2:first-child {
@ -122,6 +120,7 @@ nav button:hover, nav button:focus {
} }
main { main {
padding-top: 1em;
grid-area: main; grid-area: main;
} }
@ -543,6 +542,8 @@ footer button {
margin: 0; margin: 0;
border: none; border: none;
background: #222; background: #222;
font-size: 1.5em;
padding: 0.25em;
} }
footer button:disabled { footer button:disabled {

View File

@ -26,6 +26,8 @@
} }
#mnml.nav-visible nav { #mnml.nav-visible nav {
padding-left: 0;
margin: 0;
display: block; display: block;
grid-area: main; grid-area: main;
} }

View File

@ -10,7 +10,6 @@
<meta name="author" content="ntr@smokestack.io"> <meta name="author" content="ntr@smokestack.io">
<link rel="manifest" href="manifest.webmanifest"> <link rel="manifest" href="manifest.webmanifest">
<link rel="stylesheet" href="./node_modules/izitoast/dist/css/iziToast.min.css"></script> <link rel="stylesheet" href="./node_modules/izitoast/dist/css/iziToast.min.css"></script>
<link href="https://fonts.googleapis.com/css?family=Jura" rel="stylesheet">
<link rel="stylesheet" href="assets/styles/normalize.css"> <link rel="stylesheet" href="assets/styles/normalize.css">
<link rel="stylesheet" href="assets/styles/skeleton.css"> <link rel="stylesheet" href="assets/styles/skeleton.css">
</head> </head>

View File

@ -36,9 +36,8 @@ function ListFooter(args) {
<footer> <footer>
<button id="nav-btn" onClick={() => setShowNav(!showNav)} ></button> <button id="nav-btn" onClick={() => setShowNav(!showNav)} ></button>
<button <button
className="instance-btn instance-ui-btn left"
onClick={() => navToTeam()}> onClick={() => navToTeam()}>
Change Constructs Back
</button> </button>
</footer> </footer>
); );

View File

@ -45,7 +45,6 @@ function TeamFooter(args) {
<button id="nav-btn" onClick={() => setShowNav(!showNav)} ></button> <button id="nav-btn" onClick={() => setShowNav(!showNav)} ></button>
<button <button
disabled={team.some(c => !c)} disabled={team.some(c => !c)}
className="instance-btn instance-ui-btn right"
onClick={() => navToList()}> onClick={() => navToList()}>
Join Instance Join Instance
</button> </button>

View File

@ -284,7 +284,7 @@ function Vbox(args) {
} }
const classes = `vbox`; const classes = `vbox`;
const reclaimClass = `instance-btn instance-ui-btn vbox-btn reclaim ${reclaiming ? 'reclaiming' : ''}`; const reclaimClass = `vbox-btn reclaim ${reclaiming ? 'reclaiming' : ''}`;
return ( return (
<div className={classes}> <div className={classes}>
@ -294,7 +294,6 @@ function Vbox(args) {
<div className="bits" onMouseOver={e => hoverInfo(e, 'bits')} >{vbox.bits}b</div> <div className="bits" onMouseOver={e => hoverInfo(e, 'bits')} >{vbox.bits}b</div>
</div> </div>
<button <button
className="instance-btn instance-ui-btn vbox-btn"
onMouseOver={e => hoverInfo(e, 'reroll')} onMouseOver={e => hoverInfo(e, 'reroll')}
onClick={() => sendVboxDiscard()}> onClick={() => sendVboxDiscard()}>
Reroll Reroll
@ -322,7 +321,6 @@ function Vbox(args) {
<div className="vbox-combiner" onMouseOver={e => hoverInfo(e, 'combiner')} > <div className="vbox-combiner" onMouseOver={e => hoverInfo(e, 'combiner')} >
<h3 onTouchStart={e => e.target.scrollIntoView(true)}>I-COMBINATOR</h3> <h3 onTouchStart={e => e.target.scrollIntoView(true)}>I-COMBINATOR</h3>
<button <button
className="instance-btn instance-ui-btn vbox-btn"
onMouseOver={e => hoverInfo(e, 'refine')} onMouseOver={e => hoverInfo(e, 'refine')}
onClick={() => sendVboxCombine()}> onClick={() => sendVboxCombine()}>
refine refine