diff --git a/client/assets/styles/footer.less b/client/assets/styles/footer.less index 8ab8873a..cf9b6012 100644 --- a/client/assets/styles/footer.less +++ b/client/assets/styles/footer.less @@ -6,6 +6,7 @@ footer { button { margin: 0; + border-radius: 0; border: none; background: #222; font-size: 1.5em; diff --git a/client/assets/styles/game.less b/client/assets/styles/game.less index 0a71051c..a8765ba5 100644 --- a/client/assets/styles/game.less +++ b/client/assets/styles/game.less @@ -317,37 +317,58 @@ grid-template-rows: 1fr 0.2fr 1.5fr; grid-template-columns: 1fr; - } - .game .stats div { - padding: 0; - } + .game-construct { + display: grid; + grid-template-columns: 1fr; + grid-template-rows: min-content 1fr; - .game .stats .max { - display: none; - } + .left { + grid-template-rows: min-content min-content; + } - .game .stats .value { - display: flex; - } + .skills { + button { + padding: 0 0.5em ; + margin: 0; + } + } - .game .stats svg { - height: 1em; - } + .stats div { + padding: 0; + } - .game .stats div { - margin: 0 0.2em; - } + .stats .max { + display: none; + } - .game .effects { - font-size: 100%; - } + .stats .value { + display: flex; + } - #mnml .game .skills button, #mnml .game .stats { - font-size: 75%; - } + .stats svg { + height: 1em; + } - .game-construct .name { - display: none; + .stats div { + margin: 0 0.2em; + } + + .effects { + font-size: 100%; + } + + .skills button, .stats, .name { + font-size: 75%; + } + } + + .opponent { + .game-construct { + display: grid; + grid-template-columns: 1fr; + grid-template-rows: min-content 1fr; + } + } } } \ No newline at end of file diff --git a/client/assets/styles/styles.mobile.css b/client/assets/styles/styles.mobile.css index 6b09a6c7..4ff0b321 100644 --- a/client/assets/styles/styles.mobile.css +++ b/client/assets/styles/styles.mobile.css @@ -1,9 +1,10 @@ @media (max-width: 800px) { #mnml { - font-size: 14pt; + font-size: 12pt; padding: 1em 0 0 0; grid-template-columns: 1fr; grid-template-rows: 1fr min-content; + overflow-y: scroll; grid-template-areas: "main" "footer"; diff --git a/server/src/events.rs b/server/src/events.rs index ad3d898f..9902991e 100644 --- a/server/src/events.rs +++ b/server/src/events.rs @@ -263,7 +263,7 @@ impl Events { None => false, }) .map(|(_id, c)| PvpRequest { id: c.id, account: c.account.unwrap(), tx: c.tx.clone() }) - .ok_or(format_err!("invite not found code={:?}", code))?; + .ok_or(format_err!("invite expired code={:?}", code))?; let join = PvpRequest { id: c.id, account: c.account.unwrap(), tx: c.tx.clone() };