ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'new-vbox-resize' of ssh://git.mnml.gg:40022/~/mnml into new-vbox-resize

Browse Source
This commit is contained in:
ntr 2019-11-24 18:00:14 +11:00
commit 308165b33a
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/assets/styles/styles.less
View File

@ -123,7 +123,7 @@ button, input {
font-family: 'Jura'; font-family: 'Jura';
color: whitesmoke; color: whitesmoke;
height: auto; height: auto;
border-width: 0.2em; border-width: 0.1em;
border-color: @gray-exists; border-color: @gray-exists;
letter-spacing: 0.25em; letter-spacing: 0.25em;
box-sizing: border-box; box-sizing: border-box;

4
client/assets/styles/vbox.less
View File

@ -50,6 +50,7 @@
grid-area: combiner; grid-area: combiner;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
line-height: 1.3;
padding: 0; padding: 0;
@ -59,6 +60,9 @@
} }
button { button {
line-height: 1.3;
font-size: 1.25em;
letter-spacing: 0.1em; letter-spacing: 0.1em;
background-color: @yellow; background-color: @yellow;
color: black; color: black;

6
client/src/components/vbox.combiner.jsx
View File

@ -34,12 +34,12 @@ function combinerBtn(props) {
let bits = 0; let bits = 0;
storeSelect.forEach(item => bits += item[0] + 1); storeSelect.forEach(item => bits += item[0] + 1);
text = bits text = bits
? `Buy ${comboItem} - ${bits}b` ? <p>Buy<br/>{comboItem}<br />{bits}b</p>
: `Combine - ${comboItem}`; : <p>Combine<br />{comboItem}</p>;
if (vbox.bits >= bits) mouseEvent = sendVboxCombine; if (vbox.bits >= bits) mouseEvent = sendVboxCombine;
} else if (stashSelect.length === 0 && storeSelect.length === 1) { } else if (stashSelect.length === 0 && storeSelect.length === 1) {
const item = storeSelect[0]; const item = storeSelect[0];
text = `Buy ${vbox.free[item[0]][item[1]]} ${item[0] + 1}b`; text = <p>Buy<br />{vbox.free[item[0]][item[1]]}<br />{item[0] + 1}b</p>;
mouseEvent = vboxBuySelected; mouseEvent = vboxBuySelected;
} else { } else {
for (let i = 0; i < 3; i++) { for (let i = 0; i < 3; i++) {