From 637d3e5be81fc14111694fd17717661a18f6387f Mon Sep 17 00:00:00 2001 From: Mashy Date: Fri, 22 Nov 2019 15:46:49 +1000 Subject: [PATCH 1/2] combiner new line --- client/assets/styles/vbox.less | 4 ++++ client/src/components/vbox.combiner.jsx | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/client/assets/styles/vbox.less b/client/assets/styles/vbox.less index a48ebad0..71999993 100644 --- a/client/assets/styles/vbox.less +++ b/client/assets/styles/vbox.less @@ -50,6 +50,7 @@ grid-area: combiner; display: flex; flex-direction: column; + line-height: 1.3; padding: 0; @@ -59,6 +60,9 @@ } button { + line-height: 1.3; + font-size: 1.25em; + letter-spacing: 0.1em; background-color: #996100; border-radius: 0; diff --git a/client/src/components/vbox.combiner.jsx b/client/src/components/vbox.combiner.jsx index e1514e1f..5b02b88e 100644 --- a/client/src/components/vbox.combiner.jsx +++ b/client/src/components/vbox.combiner.jsx @@ -34,12 +34,12 @@ function combinerBtn(props) { let bits = 0; storeSelect.forEach(item => bits += item[0] + 1); text = bits - ? `Buy ${comboItem} - ${bits}b` - : `Combine - ${comboItem}`; + ?

Buy
{comboItem}
{bits}b

+ :

Combine
{comboItem}

; if (vbox.bits >= bits) mouseEvent = sendVboxCombine; } else if (stashSelect.length === 0 && storeSelect.length === 1) { const item = storeSelect[0]; - text = `Buy ${vbox.free[item[0]][item[1]]} ${item[0] + 1}b`; + text =

Buy
{vbox.free[item[0]][item[1]]}
{item[0] + 1}b

; mouseEvent = vboxBuySelected; } else { for (let i = 0; i < 3; i++) { From bdf3244f583d1952219c9c104e1e3ec2732019cd Mon Sep 17 00:00:00 2001 From: Mashy Date: Fri, 22 Nov 2019 15:57:15 +1000 Subject: [PATCH 2/2] border width 0.2 -> 0.1 --- client/assets/styles/styles.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less index 72ab973c..e4e9264a 100644 --- a/client/assets/styles/styles.less +++ b/client/assets/styles/styles.less @@ -125,7 +125,7 @@ button, input { font-family: 'Jura'; color: whitesmoke; height: auto; - border-width: 0.2em; + border-width: 0.1em; border-color: @gray-exists; letter-spacing: 0.25em; box-sizing: border-box;