From bd1445d23d3cf9b85b9bc593e99acbe88e50c2a7 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Sun, 24 Jan 2021 11:40:50 +0100 Subject: [PATCH] puzzle storm font --- public/font/alarmclock.woff2 | Bin 0 -> 6752 bytes ui/storm/css/_clock.scss | 3 ++- ui/storm/css/_combo.scss | 16 +++++----------- ui/storm/css/_end.scss | 4 ++-- ui/storm/css/_play.scss | 5 +++-- ui/storm/css/_storm.scss | 8 ++++++++ ui/storm/src/view/end.ts | 3 +-- ui/storm/src/view/main.ts | 7 ++----- 8 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 public/font/alarmclock.woff2 diff --git a/public/font/alarmclock.woff2 b/public/font/alarmclock.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..fcae9c38d873e5cb7457bd27c0593a45a84938ca GIT binary patch literal 6752 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 [ const renderSummary = (ctrl: StormCtrl): VNode => { const wins = ctrl.countWins(); - console.log(ctrl.trans.vdomPlural('xPuzzlesSolved', wins, h('strong', wins))); return h('div.storm__summary', [ h('div.storm__summary__solved', [ - h('strong.storm__summary__solved__number', { + h('span.storm__summary__solved__number', { hook: onInsert(el => numberSpread(el, wins, Math.round(wins * 50), 0)(wins)) }, '0'), h('p', ctrl.trans('puzzlesSolved')) diff --git a/ui/storm/src/view/main.ts b/ui/storm/src/view/main.ts index 04ef5595eb..fa1cd0521c 100644 --- a/ui/storm/src/view/main.ts +++ b/ui/storm/src/view/main.ts @@ -38,10 +38,7 @@ const renderCombo = (ctrl: StormCtrl): VNode => h('div.storm__combo', [ h('div.storm__combo__icon'), h('div.storm__combo__counter', [ - h('span.storm__combo__counter__value', [ - h('span', 'x'), - h('strong', ctrl.vm.combo) - ]), + h('span.storm__combo__counter__value', ctrl.vm.combo), h('span.storm__combo__counter__combo', 'COMBO') ]), h('div.storm__combo__bars', [ @@ -63,7 +60,7 @@ const renderCombo = (ctrl: StormCtrl): VNode => const renderSolved = (ctrl: StormCtrl): VNode => h('div.storm__solved', [ h('div', [ - h('strong', ctrl.countWins()), + h('span.storm__solved__value', ctrl.countWins()), 'puzzles solved' ]), h('div.alpha', [