diff --git a/client/assets/styles/vbox.less b/client/assets/styles/vbox.less index 76416c5c..9682182e 100644 --- a/client/assets/styles/vbox.less +++ b/client/assets/styles/vbox.less @@ -3,10 +3,10 @@ grid-area: vbox; display: grid; grid-template-rows: 3fr 2fr; - grid-template-columns: 1fr 4fr 6fr; + grid-template-columns: 1fr 4fr 6fr 15.5em; // =\ grid-template-areas: - "store-hdr store info" - "stash-hdr stash info"; + "store-hdr store info combos" + "stash-hdr stash combiner combos"; margin-bottom: 1em; line-height: 0; @@ -60,7 +60,7 @@ grid-area: stash-hdr; display: flex; flex-flow: column; - + text-align: center; border: 0.15em solid @gray; border-right: 0; @@ -207,84 +207,81 @@ "item" "combiner"; - .combiner { - grid-area: combiner; - display: flex; - width: 60%; - button { - margin-top: 1em; - line-height: 1.3; - font-size: 1.25em; - letter-spacing: 0.1em; - &:hover { - border: 2px solid @gray-hover; - } - } - } - - .info-item { grid-area: item; } } + } - .combos { + .combiner { + grid-area: combiner; + align-self: flex-end; + margin: 0 0.5em; + line-height: 1.3; + font-size: 1.25em; + letter-spacing: 0.1em; + border: 2px solid @gray-exists; + &:hover { + border: 2px solid @gray-hover; + } + } + + .combos { + display: grid; + grid-area: combos; + margin-left: 0.5em; + grid-template-rows: min-content min-content; + grid-template-areas: + "comboHeader" + "comboList"; + .combo-header { + text-align: center; + } + + .combo-list { display: grid; - grid-area: combos; - margin-left: 0.5em; - grid-template-rows: min-content min-content; - grid-template-areas: - "comboHeader" - "comboList"; - .combo-header { - text-align: center; - } + grid-template-rows: min-content min-content min-content; + grid-template-columns: min-content min-content; + grid-gap: 0.5em; + margin-top: 0.5em; + width: 15.5em; - .combo-list { + .table-button { display: grid; - grid-template-rows: min-content min-content min-content; - grid-template-columns: min-content min-content; - grid-gap: 0.5em; - margin-top: 0.5em; - width: 15.5em; - - .table-button { - display: grid; - text-align: center; - align-content: center; - grid-template-areas: - "item" - "ingr"; - - cursor: pointer; - &:hover { - color: whitesmoke; - background-color: @gray; - } - - .item { - border-top: 2px solid #222; - border-bottom: 2px solid #222; - flex: 1; - grid-area: item; - font-weight: bold; - div { - width: 5em; - } - } + text-align: center; + align-content: center; + grid-template-areas: + "item" + "ingr"; + cursor: pointer; + &:hover { + color: whitesmoke; + background-color: @gray; + } + .item { + border-top: 2px solid #222; + border-bottom: 2px solid #222; + flex: 1; + grid-area: item; + font-weight: bold; div { - border-left: 2px solid #222; - border-right: 2px solid #222; - height: 1.75em; - width: 7.5em; - svg { - vertical-align: middle; - } - &:last-child { - border-bottom: 2px solid #222; - } + width: 5em; + } + } + + + div { + border-left: 2px solid #222; + border-right: 2px solid #222; + height: 1.75em; + width: 7.5em; + svg { + vertical-align: middle; + } + &:last-child { + border-bottom: 2px solid #222; } } } diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx index b0f7e4a3..9253bdaf 100644 --- a/client/src/components/vbox.component.jsx +++ b/client/src/components/vbox.component.jsx @@ -8,6 +8,7 @@ const actions = require('../actions'); const InfoContainer = require('./vbox.info'); const StashElement = require('./vbox.stash'); const StoreElement = require('./vbox.store'); +const Combiner = require('./vbox.combiner'); const addState = connect( function receiveState(state) { @@ -227,10 +228,6 @@ class Vbox extends preact.Component {
{storeHdr()} {stashHdr()} - +
+ +
); }