combiner out

This commit is contained in:
ntr 2019-11-24 21:39:28 +11:00
parent c03a687bba
commit f1170c6c43
2 changed files with 75 additions and 75 deletions

View File

@ -3,10 +3,10 @@
grid-area: vbox; grid-area: vbox;
display: grid; display: grid;
grid-template-rows: 3fr 2fr; grid-template-rows: 3fr 2fr;
grid-template-columns: 1fr 4fr 6fr; grid-template-columns: 1fr 4fr 6fr 15.5em; // =\
grid-template-areas: grid-template-areas:
"store-hdr store info" "store-hdr store info combos"
"stash-hdr stash info"; "stash-hdr stash combiner combos";
margin-bottom: 1em; margin-bottom: 1em;
line-height: 0; line-height: 0;
@ -207,26 +207,24 @@
"item" "item"
"combiner"; "combiner";
.info-item {
grid-area: item;
}
}
}
.combiner { .combiner {
grid-area: combiner; grid-area: combiner;
display: flex; align-self: flex-end;
width: 60%; margin: 0 0.5em;
button {
margin-top: 1em;
line-height: 1.3; line-height: 1.3;
font-size: 1.25em; font-size: 1.25em;
letter-spacing: 0.1em; letter-spacing: 0.1em;
border: 2px solid @gray-exists;
&:hover { &:hover {
border: 2px solid @gray-hover; border: 2px solid @gray-hover;
} }
} }
}
.info-item {
grid-area: item;
}
}
.combos { .combos {
display: grid; display: grid;
@ -290,7 +288,6 @@
} }
} }
} }
}
@media (min-width: 2000px) { @media (min-width: 2000px) {
.vbox { .vbox {

View File

@ -8,6 +8,7 @@ const actions = require('../actions');
const InfoContainer = require('./vbox.info'); const InfoContainer = require('./vbox.info');
const StashElement = require('./vbox.stash'); const StashElement = require('./vbox.stash');
const StoreElement = require('./vbox.store'); const StoreElement = require('./vbox.store');
const Combiner = require('./vbox.combiner');
const addState = connect( const addState = connect(
function receiveState(state) { function receiveState(state) {
@ -227,10 +228,6 @@ class Vbox extends preact.Component {
<div class='vbox'> <div class='vbox'>
{storeHdr()} {storeHdr()}
{stashHdr()} {stashHdr()}
<InfoContainer
vboxHighlight={vboxHighlight}
vboxBuySelected={vboxBuySelected}
/>
<StoreElement <StoreElement
clearVboxSelected = {clearVboxSelected} clearVboxSelected = {clearVboxSelected}
setInfo = {setInfo} setInfo = {setInfo}
@ -254,6 +251,12 @@ class Vbox extends preact.Component {
setInfo = {setInfo} setInfo = {setInfo}
setVboxSelected = {setVboxSelected} setVboxSelected = {setVboxSelected}
/> />
<div class="info"></div>
<Combiner
vboxHighlight={vboxHighlight}
vboxBuySelected={vboxBuySelected}
/>
<div class="combos"></div>
</div> </div>
); );
} }