From 64fc508ae6ff32be7009bb32966714bd138a2b26 Mon Sep 17 00:00:00 2001 From: ntr Date: Sun, 24 Nov 2019 22:00:53 +1100 Subject: [PATCH] combos wip --- client/assets/styles/vbox.less | 31 +++++++++++++++++++++++- client/src/components/vbox.component.jsx | 7 +++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/client/assets/styles/vbox.less b/client/assets/styles/vbox.less index 9682182e..582899a0 100644 --- a/client/assets/styles/vbox.less +++ b/client/assets/styles/vbox.less @@ -3,7 +3,7 @@ grid-area: vbox; display: grid; grid-template-rows: 3fr 2fr; - grid-template-columns: 1fr 4fr 6fr 15.5em; // =\ + grid-template-columns: 1fr 4fr 6fr min-content; // =\ grid-template-areas: "store-hdr store info combos" "stash-hdr stash combiner combos"; @@ -176,10 +176,12 @@ h2 { text-transform: uppercase; } + svg { display: inline; height: 1em; } + figure { display: inline; height: 0.5em; @@ -187,11 +189,13 @@ margin-right: 0.5em; } } + figcaption { font-size: 1em; display: inline-block; vertical-align: middle; } + margin-left: 1em; grid-area: info; display: grid; @@ -234,6 +238,31 @@ grid-template-areas: "comboHeader" "comboList"; + + h2 { + text-transform: uppercase; + } + + svg { + display: inline; + height: 1em; + } + + figure { + display: inline; + height: 0.5em; + svg { + margin-right: 0.5em; + } + } + + figcaption { + font-size: 1em; + display: inline-block; + vertical-align: middle; + } + + .combo-header { text-align: center; } diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx index 9253bdaf..bf5391aa 100644 --- a/client/src/components/vbox.component.jsx +++ b/client/src/components/vbox.component.jsx @@ -9,6 +9,7 @@ const InfoContainer = require('./vbox.info'); const StashElement = require('./vbox.stash'); const StoreElement = require('./vbox.store'); const Combiner = require('./vbox.combiner'); +const Combos = require('./vbox.combos'); const addState = connect( function receiveState(state) { @@ -256,7 +257,11 @@ class Vbox extends preact.Component { vboxHighlight={vboxHighlight} vboxBuySelected={vboxBuySelected} /> -
+ + ); }