diff --git a/client/assets/styles/game.css b/client/assets/styles/game.css index a5ac1076..4c6593b4 100644 --- a/client/assets/styles/game.css +++ b/client/assets/styles/game.css @@ -3,10 +3,8 @@ .game { overflow: hidden; display: grid; - grid-template-rows: min-content min-content 1fr 0.5fr 1.5fr; + grid-template-rows: 1fr 0.5fr 1.5fr; grid-template-areas: - "ready" - "timer" "opponent" "target" "player"; @@ -73,12 +71,12 @@ transition-timing-function: ease; } -.game #targeting { +#targeting { + grid-area: target; height: 100%; width: 100%; stroke-width: 2px; stroke: whitesmoke; - } /* some stupid bug in chrome makes it fill the entire screen */ diff --git a/client/assets/styles/instance.css b/client/assets/styles/instance.css index b7d85b63..ff109d77 100644 --- a/client/assets/styles/instance.css +++ b/client/assets/styles/instance.css @@ -37,12 +37,6 @@ grid-area: constructs; } -.instance-ui-btn { - font-size: 100%; - padding: 0; - margin: 0; -} - .instance .info { /*font-size: 75%;*/ margin-left: 1em; diff --git a/client/assets/styles/styles.css b/client/assets/styles/styles.css index 255fb4a6..32f96dfb 100644 --- a/client/assets/styles/styles.css +++ b/client/assets/styles/styles.css @@ -67,21 +67,19 @@ figure { } #mnml { - padding: 0 2em; display: grid; grid-template-columns: 1fr 8fr; grid-template-rows: min-content 1fr min-content; grid-template-areas: "hd hd" "nav main" - "nav footer"; + "footer footer"; } nav { grid-area: nav; + padding-left: 2em; margin-right: 2em; - overflow: hidden; - white-space: nowrap; } nav h2:first-child { @@ -122,6 +120,7 @@ nav button:hover, nav button:focus { } main { + padding-top: 1em; grid-area: main; } @@ -543,6 +542,8 @@ footer button { margin: 0; border: none; background: #222; + font-size: 1.5em; + padding: 0.25em; } footer button:disabled { diff --git a/client/assets/styles/styles.mobile.css b/client/assets/styles/styles.mobile.css index 62a5904a..94b58e2d 100644 --- a/client/assets/styles/styles.mobile.css +++ b/client/assets/styles/styles.mobile.css @@ -26,6 +26,8 @@ } #mnml.nav-visible nav { + padding-left: 0; + margin: 0; display: block; grid-area: main; } diff --git a/client/index.html b/client/index.html index 3101999c..37b7ce89 100644 --- a/client/index.html +++ b/client/index.html @@ -10,7 +10,6 @@ - diff --git a/client/src/components/list.footer.jsx b/client/src/components/list.footer.jsx index 36a509cf..fc69f8d7 100644 --- a/client/src/components/list.footer.jsx +++ b/client/src/components/list.footer.jsx @@ -36,9 +36,8 @@ function ListFooter(args) { ); diff --git a/client/src/components/team.footer.jsx b/client/src/components/team.footer.jsx index b9a65fb6..3fce4752 100644 --- a/client/src/components/team.footer.jsx +++ b/client/src/components/team.footer.jsx @@ -45,7 +45,6 @@ function TeamFooter(args) { diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx index 4899b260..a512d94b 100644 --- a/client/src/components/vbox.component.jsx +++ b/client/src/components/vbox.component.jsx @@ -284,7 +284,7 @@ function Vbox(args) { } const classes = `vbox`; - const reclaimClass = `instance-btn instance-ui-btn vbox-btn reclaim ${reclaiming ? 'reclaiming' : ''}`; + const reclaimClass = `vbox-btn reclaim ${reclaiming ? 'reclaiming' : ''}`; return (
@@ -294,7 +294,6 @@ function Vbox(args) {
hoverInfo(e, 'bits')} >{vbox.bits}b