From 002df6f7f0b5b0ea299195eb2110b85430d4de4f Mon Sep 17 00:00:00 2001 From: Benedikt Werner <1benediktwerner@gmail.com> Date: Tue, 9 Nov 2021 17:36:34 +0100 Subject: [PATCH] CSS: Improve simul styling --- ui/simul/css/_show.scss | 7 ++++++- ui/simul/src/view/created.ts | 6 +++--- ui/simul/src/view/main.ts | 12 +++++++----- ui/simul/src/view/util.ts | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ui/simul/css/_show.scss b/ui/simul/css/_show.scss index d904128896..c376ab5d69 100644 --- a/ui/simul/css/_show.scss +++ b/ui/simul/css/_show.scss @@ -10,11 +10,16 @@ $box-padding: var(--box-padding); @import 'started'; .simul { + @include breakpoint($mq-xx-small) { + .box__top { + flex-wrap: nowrap; + } + } + h1 { font-size: 2.1em; .author { - margin-left: 0.7em; font-size: 0.7em; } } diff --git a/ui/simul/src/view/created.ts b/ui/simul/src/view/created.ts index 7d5976ad3e..5439976e50 100644 --- a/ui/simul/src/view/created.ts +++ b/ui/simul/src/view/created.ts @@ -1,12 +1,12 @@ -import { h, VNode } from 'snabbdom'; -import { bind } from 'common/snabbdom'; +import { h } from 'snabbdom'; +import { bind, MaybeVNode } from 'common/snabbdom'; import SimulCtrl from '../ctrl'; import { Applicant } from '../interfaces'; import xhr from '../xhr'; import * as util from './util'; import modal from 'common/modal'; -export default function (showText: (ctrl: SimulCtrl) => VNode) { +export default function (showText: (ctrl: SimulCtrl) => MaybeVNode) { return (ctrl: SimulCtrl) => { const candidates = ctrl.candidates().sort(byName), accepted = ctrl.accepted().sort(byName), diff --git a/ui/simul/src/view/main.ts b/ui/simul/src/view/main.ts index b26227f2fd..eb390ca55a 100644 --- a/ui/simul/src/view/main.ts +++ b/ui/simul/src/view/main.ts @@ -46,11 +46,13 @@ export default function (ctrl: SimulCtrl) { } const showText = (ctrl: SimulCtrl) => - h('div.simul-text', [ - h('p', { - hook: richHTML(ctrl.data.text), - }), - ]); + ctrl.data.text.length > 0 + ? h('div.simul-text', [ + h('p', { + hook: richHTML(ctrl.data.text), + }), + ]) + : undefined; const started = (ctrl: SimulCtrl) => [util.title(ctrl), showText(ctrl), results(ctrl), pairings(ctrl)]; diff --git a/ui/simul/src/view/util.ts b/ui/simul/src/view/util.ts index 5dff403a04..442da300c5 100644 --- a/ui/simul/src/view/util.ts +++ b/ui/simul/src/view/util.ts @@ -24,4 +24,4 @@ export function player(p: Player, ctrl: SimulCtrl) { const userName = (u: LightUser) => (u.title ? [h('span.utitle', u.title), ' ' + u.name] : [u.name]); export const title = (ctrl: SimulCtrl) => - h('h1', [ctrl.data.fullName, h('span.author', ctrl.trans.vdom('by', player(ctrl.data.host, ctrl)))]); + h('h1', [ctrl.data.fullName, h('br'), h('span.author', ctrl.trans.vdom('by', player(ctrl.data.host, ctrl)))]);