From a50d10185fe4504ef73a25af8ee6a04ad0ce075b Mon Sep 17 00:00:00 2001 From: Mashy Date: Mon, 25 Nov 2019 22:18:04 +1000 Subject: [PATCH] click clear, match default refund border width --- client/assets/styles/vbox.less | 3 ++- client/src/components/instance.component.jsx | 3 +++ client/src/components/vbox.combos.jsx | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client/assets/styles/vbox.less b/client/assets/styles/vbox.less index fbc29662..304b288a 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 minmax(min-content, 2fr); - grid-template-columns: 1fr 4fr 6fr min-content; + grid-template-columns: 1fr 4fr 6fr minmax(min-content, 2fr);; grid-template-areas: "store-hdr store info-combiner combos" "stash-hdr stash info-combiner combos"; @@ -71,6 +71,7 @@ button { line-height: 1.6; letter-spacing: 0.15em; + border-width: 1px; } } diff --git a/client/src/components/instance.component.jsx b/client/src/components/instance.component.jsx index c59b5833..2022f564 100644 --- a/client/src/components/instance.component.jsx +++ b/client/src/components/instance.component.jsx @@ -27,6 +27,9 @@ const addState = connect( function clearItems() { dispatch(actions.setItemUnequip([])); + dispatch(actions.setVboxCombiner(null)); + dispatch(actions.setVboxHighlight(null)); + dispatch(actions.setVboxInfo(null)); dispatch(actions.setVboxSelected({ storeSelect: [], stashSelect: [] })); return true; } diff --git a/client/src/components/vbox.combos.jsx b/client/src/components/vbox.combos.jsx index f988064c..5973f221 100644 --- a/client/src/components/vbox.combos.jsx +++ b/client/src/components/vbox.combos.jsx @@ -15,7 +15,6 @@ function Combos(args) { // Static itemInfo, instance, // Only used for tutorial check - // functions } = args; if (tutorial && instance.time_control === 'Practice' && instance.rounds.length === 1) return false;