From 0722b194b04e2302b50a82fb20045089bc0937f0 Mon Sep 17 00:00:00 2001 From: Mashy Date: Fri, 22 Nov 2019 00:18:17 +1000 Subject: [PATCH] misc styling (actual commit) --- client/assets/styles/game.less | 13 +++--------- client/assets/styles/skeleton.css | 1 - client/assets/styles/styles.less | 3 ++- client/assets/styles/styles.mobile.less | 18 ++++++++++------ client/assets/styles/vbox.less | 26 ------------------------ client/src/components/vbox.inventory.jsx | 1 + 6 files changed, 18 insertions(+), 44 deletions(-) diff --git a/client/assets/styles/game.less b/client/assets/styles/game.less index 4ddacc63..92ec48ae 100644 --- a/client/assets/styles/game.less +++ b/client/assets/styles/game.less @@ -150,15 +150,10 @@ width: 100%; height: 2em; margin-right: 1em; - span { - background-color: black; - } + background-color: black; } button.active { - background: #2c2c2c; - span { - background-color: #2c2c2c; - } + background-color: #2c2c2c; } } @@ -266,9 +261,7 @@ padding-right: 1em; text-align: center; z-index: 2; - span { - background-color: black; - } + background-color: black; svg { display: inline; height: 1em; diff --git a/client/assets/styles/skeleton.css b/client/assets/styles/skeleton.css index 13bb3549..037e1747 100644 --- a/client/assets/styles/skeleton.css +++ b/client/assets/styles/skeleton.css @@ -176,7 +176,6 @@ input[type="button"] { /*padding: 0 2em;*/ color: #555; text-align: center; - font-size: 11px; font-weight: 600; line-height: 38px; letter-spacing: .1rem; diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less index de7f9dea..202674b2 100644 --- a/client/assets/styles/styles.less +++ b/client/assets/styles/styles.less @@ -22,6 +22,7 @@ html body { -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; + -webkit-tap-highlight-color: transparent; overflow-x: hidden; overflow-y: hidden; @@ -128,7 +129,7 @@ button, input { border-color: @gray-exists; letter-spacing: 0.25em; box-sizing: border-box; - font-size: 100%; + font-size: 1em; flex: 1; border-radius: 0.5em; line-height: 2em; diff --git a/client/assets/styles/styles.mobile.less b/client/assets/styles/styles.mobile.less index ff8adf1a..a8c8ac96 100644 --- a/client/assets/styles/styles.mobile.less +++ b/client/assets/styles/styles.mobile.less @@ -1,10 +1,11 @@ @media (max-width: 800px) { body { overflow-y: initial; + } #mnml { - font-size: 6pt; + font-size: 8pt; padding: 0.25em; .instance { @@ -27,8 +28,8 @@ } .game { + font-size: 7.5pt; .stats { - font-size: 8pt; svg { stroke-width: 1.5em; } @@ -57,17 +58,22 @@ } .skills { - button[disabled] { - display: none; + display: grid; + grid-template-rows: 1fr; + grid-template-columns: 1fr 1fr 1fr; + button { + font-size: 0.9em; + letter-spacing: 0.05em; } + + } .effects { - font-size: 1em; + font-size: 1.1em; } .skill-description { - font-size: 0.8em; svg { height: 1em; } diff --git a/client/assets/styles/vbox.less b/client/assets/styles/vbox.less index e24aba7e..115decff 100644 --- a/client/assets/styles/vbox.less +++ b/client/assets/styles/vbox.less @@ -190,30 +190,4 @@ line-height: initial; } } -} - -.vbox-combiner { - grid-area: combiner; - display: flex; - flex-flow: column; - justify-content: flex-end; -} - -.vbox-combiner button { - flex: 0; -} - - -.vbox-hdr { - display: flex; -} - -.vbox-hdr h3 { - flex: 1; -} - -.vbox-hdr .bits { - font-size: 2em; - line-height: 1em; - animation: bits 1s ease-out; } \ No newline at end of file diff --git a/client/src/components/vbox.inventory.jsx b/client/src/components/vbox.inventory.jsx index f4f80e06..8aa22a14 100644 --- a/client/src/components/vbox.inventory.jsx +++ b/client/src/components/vbox.inventory.jsx @@ -25,6 +25,7 @@ function inventoryElement(props) { function inventoryClick(e) { e.stopPropagation(); if (itemUnequip.length) return sendItemUnequip(itemUnequip); + if (vboxSelecting) return vboxBuySelected(); return true; }