getting somewhere

This commit is contained in:
Mashy 2019-05-09 22:37:59 +10:00
parent e2dfd5ec5f
commit 00a367c0ee
2 changed files with 73 additions and 42 deletions

View File

@ -369,12 +369,47 @@ header {
*/ */
.instance { .instance {
display: grid;
grid-gap: 10px;
grid-template-columns: repeat(12, 1fr);
grid-template-rows: repeat(6, 1fr);
grid-template-areas:
"n v v v v v v v v v v v"
"n v v v v v v v v v v v"
"f f f f f f f f f f f f"
"f f f f f f f f f f f f"
"f f f f f f f f f f f f"
"f f f f f f f f f f f f";
}
.vbox {
grid-area: v;
display: grid;
grid-template-columns: repeat(11, 1fr);
grid-template-rows: repeat(2, 1fr);
grid-template-areas:
"vb vb vb vb vb . i i i i i"
"vb vb vb vb vb . i i i i i"
}
.vbox-box {
grid-area: vb;
justify-self: end;
max-width: 600px;
display: flex;
flex-flow: row wrap;
}
.vbox-inventory {
grid-area: i;
justify-self: start;
max-width: 600px;
display: flex; display: flex;
flex-flow: row wrap; flex-flow: row wrap;
align-content: flex-start;
} }
.instance-hdr { .instance-hdr {
gird-area: n;
display: flex; display: flex;
flex-flow: row; flex-flow: row;
@ -463,15 +498,6 @@ button[disabled] {
box-shadow: inset 0.5em 0 0 0 #a52a2a; box-shadow: inset 0.5em 0 0 0 #a52a2a;
} }
.vbox {
flex: 1 1 25%;
display: flex;
flex-flow: row wrap;
align-content: flex-start;
min-width: 250px;
}
.vbox-hdr { .vbox-hdr {
display: flex; display: flex;
align-items: flex-end; align-items: flex-end;
@ -538,6 +564,7 @@ table td svg {
} }
.cryp-list { .cryp-list {
grid-area: f;
flex: 1 1 25%; flex: 1 1 25%;
display: flex; display: flex;

View File

@ -215,7 +215,8 @@ function Vbox(args) {
const reclaimClass = `instance-btn instance-ui-btn vbox-btn ${reclaiming ? 'reclaiming' : ''}`; const reclaimClass = `instance-btn instance-ui-btn vbox-btn ${reclaiming ? 'reclaiming' : ''}`;
return ( return (
<div className={classes} onClick={() => setReclaiming(false)} > <div className={classes}>
<div className='vbox-box' onClick={() => setReclaiming(false)} >
<div className="vbox-hdr"> <div className="vbox-hdr">
<div onTouchStart={e => e.target.scrollIntoView(true)}>VBOX</div> <div onTouchStart={e => e.target.scrollIntoView(true)}>VBOX</div>
<div className="bits" >{vbox.bits}b</div> <div className="bits" >{vbox.bits}b</div>
@ -230,6 +231,8 @@ function Vbox(args) {
{freeRows} {freeRows}
</tbody> </tbody>
</table> </table>
</div>
<div className='vbox-inventory' onClick={() => setReclaiming(false)} >
<span onTouchStart={e => e.target.scrollIntoView(true)}>INVENTORY</span> <span onTouchStart={e => e.target.scrollIntoView(true)}>INVENTORY</span>
<button <button
className={reclaimClass} className={reclaimClass}
@ -249,6 +252,7 @@ function Vbox(args) {
</button> </button>
{combinerElement} {combinerElement}
</div> </div>
</div>
); );
} }