diff --git a/assets/modern/live.rcss b/assets/modern/live.rcss index 378f6ef..1297a93 100644 --- a/assets/modern/live.rcss +++ b/assets/modern/live.rcss @@ -208,7 +208,7 @@ body.calm .mv-goal.fresh {animation:none;} /* notes laid on the sheet */ .mv-veil {position:absolute;left:0;top:0;width:3516.75dp;height:1973.25dp;display:flex;align-items:center;justify-content:center;border-radius:31.5dp;background-color:#1d161180;z-index:20;} -.mv-note {position:relative;display:flex;flex-direction:column;gap:27dp;box-sizing:border-box;max-height:1800dp;padding:58.5dp 63dp 45dp;border-radius:13.5dp;background-color:var(--p-n1);box-shadow:0dp 18dp 49.5dp #00000073;} +.mv-note {position:relative;display:flex;flex-direction:column;gap:27dp;box-sizing:border-box;max-height:1800dp;padding:58.5dp 63dp 45dp;border-radius:13.5dp;border:3.38dp var(--p-n4);background-color:var(--p-n1);} .mv-tape {position:absolute;left:50%;top:-24.75dp;width:247.5dp;height:54dp;margin-left:-123.75dp;background-color:#d9a4418c;transform:rotate(-1.5deg);} .mv-note h2 {display:block;font-family:Display;font-size:58.5dp;line-height:67.5dp;} .mv-note p {display:block;color:var(--p-n7);} diff --git a/assets/modern/postmatch.rcss b/assets/modern/postmatch.rcss index 66e9d2f..bc3d8fe 100644 --- a/assets/modern/postmatch.rcss +++ b/assets/modern/postmatch.rcss @@ -1,98 +1,95 @@ /* SPDX-License-Identifier: GPL-3.0-only */ -.postmatch {position:absolute;left:0;right:0;top:0;bottom:0;display:flex;flex-direction:column;gap:30dp;font-size:34dp;line-height:1.3;color:var(--text);} +.postmatch {position:absolute;left:0;right:0;top:0;bottom:0;display:flex;flex-direction:column;gap:30dp;font-size:34dp;line-height:1.3;color:var(--p-text);} .postmatch h2,.postmatch h3,.postmatch p,.postmatch ol {margin:0;} .postmatch h2>span,.postmatch h3>span,.postmatch p>span {display:block;min-width:0;} -.postmatch button {font-size:30dp;font-weight:normal;color:var(--text);background-color:transparent;} -.postmatch button[disabled] {opacity:.35;} -.postmatch button:hover,.postmatch button:focus-visible {background-color:var(--hover);} -.postmatch .selected {background-color:var(--selected);color:var(--accent);} +.mv-stage .postmatch button {font-size:29dp;line-height:38dp;} +.mv-stage .postmatch button:hover {background-color:#d9a44129;} +.postmatch .selected {background-color:var(--p-a2);color:var(--p-a7);} .postmatch-heading {display:flex;align-items:center;justify-content:space-between;gap:28dp;min-height:130dp;flex-shrink:0;} .postmatch-heading>div {flex:1;min-width:0;} -.postmatch-heading p {font-size:28dp;color:var(--muted);margin-bottom:10dp;} +.postmatch-heading p {font-size:28dp;color:var(--p-n7);margin-bottom:10dp;} .postmatch-heading h2 {font-size:54dp;font-weight:normal;letter-spacing:-1dp;} .postmatch-pickers {width:900dp;height:84dp;display:flex;gap:18dp;flex-shrink:0;} .postmatch-pickers select {flex:1;min-width:0;height:84dp;font-size:30dp;} -.postmatch-tabs {display:flex;gap:8dp;flex-shrink:0;padding:8dp;border-radius:22dp;background-color:var(--panel);border:1dp var(--border);} -.postmatch-tabs button {flex:1;min-width:0;height:84dp;border:0;border-radius:16dp;padding:22dp 12dp;white-space:nowrap;color:var(--muted);} -.postmatch-tabs button.selected {color:var(--text);} +.postmatch-tabs {display:flex;gap:8dp;flex-shrink:0;padding:8dp;border-radius:22dp;background-color:var(--p-row);border:1dp var(--p-div);} +.postmatch-tabs button {flex:1;min-width:0;height:84dp;border:0;border-radius:16dp;padding:22dp 12dp;white-space:nowrap;color:var(--p-n7);} +.postmatch-tabs button.selected {color:var(--p-text);} .postmatch-panel {position:relative;min-height:0;flex:1;display:flex;flex-direction:column;} .postmatch-actions {position:relative;display:flex;align-items:center;justify-content:flex-start;gap:32dp;min-height:84dp;flex-shrink:0;} -.postmatch-actions button {min-width:330dp;height:84dp;font-size:32dp;border:2dp var(--border);background-color:var(--soft);} -.postmatch-actions button:last-child {background-color:var(--selected);border-color:var(--accent);} -.postmatch-status {position:absolute;left:30%;top:0;width:40%;height:84dp;line-height:84dp;font-size:28dp;text-align:center;color:var(--muted);pointer-events:none;} +.postmatch-status {position:absolute;left:30%;top:0;width:40%;height:84dp;line-height:84dp;font-size:28dp;text-align:center;color:var(--p-n7);pointer-events:none;} #postmatch-ticker {margin-left:auto;} .postmatch-team {display:flex;align-items:center;gap:24dp;flex:1;min-width:0;} .postmatch-team-name {display:block;min-width:0;flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} .postmatch-team.home .postmatch-team-name {text-align:right;} .postmatch-team.away .postmatch-team-name {text-align:left;} .postmatch-team>.live-badge {flex-shrink:0;} -.postmatch-results-head {display:flex;align-items:center;gap:18dp;padding:0 35dp 20dp;font-size:28dp;color:var(--muted);flex-shrink:0;} +.postmatch-results-head {display:flex;align-items:center;gap:18dp;padding:0 35dp 20dp;font-size:28dp;color:var(--p-n7);flex-shrink:0;} .postmatch-results-head .home,.postmatch-results-head .away {flex:1;text-align:center;} .postmatch-results-head .score {width:160dp;text-align:center;flex-shrink:0;} .postmatch-results {min-height:0;flex:1;overflow-y:auto;} -.postmatch .postmatch-result-row {width:100%;min-height:116dp;border:0;border-top:1dp var(--border);border-radius:14dp;padding:15dp 35dp;display:flex;align-items:center;gap:18dp;font-size:34dp;} -.postmatch-result-row:nth-child(odd) {background-color:var(--panel);} +.postmatch .postmatch-result-row {width:100%;min-height:116dp;border:0;border-top:1dp var(--p-div);border-radius:14dp;padding:15dp 35dp;display:flex;align-items:center;gap:18dp;font-size:34dp;} +.postmatch-result-row:nth-child(odd) {background-color:var(--p-row);} .postmatch-result-score {width:160dp;flex-shrink:0;display:flex;align-items:center;justify-content:center;gap:22dp;font-size:46dp;font-weight:normal;} -.postmatch-result-score .separator {font-size:32dp;color:var(--muted);} -.postmatch .postmatch-own {color:var(--accent);} -.postmatch-scope-note {font-size:28dp;color:var(--muted);line-height:1.4;flex-shrink:0;margin-top:18dp;} +.postmatch-result-score .separator {font-size:32dp;color:var(--p-n7);} +.postmatch .postmatch-own {color:var(--p-a7);} +.postmatch-scope-note {font-size:28dp;color:var(--p-n7);line-height:1.4;flex-shrink:0;margin-top:18dp;} .postmatch-report {min-height:0;height:100%;display:flex;flex-direction:column;gap:24dp;} .postmatch-report-teams {display:flex;align-items:flex-start;gap:30dp;flex-shrink:0;} .postmatch-report-teams>div {flex:1;min-width:0;display:flex;flex-direction:column;align-items:center;gap:18dp;text-align:center;} .postmatch-report-teams strong {font-size:38dp;font-weight:normal;} .postmatch-report-teams strong>span {display:block;} .postmatch-report-teams>.postmatch-report-score {width:340dp;height:140dp;flex:none;flex-direction:row;align-items:center;justify-content:center;gap:30dp;font-size:100dp;} -.postmatch-report-score>.separator {font-size:55dp;color:var(--muted);} -.postmatch-report-meta {font-size:28dp;color:var(--muted);text-align:center;flex-shrink:0;} +.postmatch-report-score>.separator {font-size:55dp;color:var(--p-n7);} +.postmatch-report-meta {font-size:28dp;color:var(--p-n7);text-align:center;flex-shrink:0;} .postmatch-event-columns {display:flex;gap:70dp;min-height:0;flex:1;overflow-y:auto;} .postmatch-event-column {width:50%;min-width:0;padding:0;} -.postmatch-event-column+.postmatch-event-column {border-left:1dp var(--border);padding-left:70dp;} +.postmatch-event-column+.postmatch-event-column {border-left:1dp var(--p-div);padding-left:70dp;} .postmatch .postmatch-event {display:flex;width:100%;align-items:center;gap:25dp;border:0;border-radius:12dp;text-align:left;padding:17dp 10dp;font-size:30dp;} -.postmatch-event-time {width:75dp;flex-shrink:0;font-size:28dp;color:var(--muted);} +.postmatch-event-time {width:75dp;flex-shrink:0;font-size:28dp;color:var(--p-n7);} .postmatch-event>.image-frame {flex-shrink:0;} .postmatch-event-copy {flex:1;min-width:0;display:flex;flex-direction:column;gap:4dp;} .postmatch-event-copy>strong {font-weight:normal;} -.postmatch-event-copy>span {font-size:28dp;color:var(--muted);} -.postmatch-no-events {padding:35dp 10dp;font-size:28dp;color:var(--muted);} +.postmatch-event-copy>span {font-size:28dp;color:var(--p-n7);} +.postmatch-no-events {padding:35dp 10dp;font-size:28dp;color:var(--p-n7);} .postmatch-timeline {display:flex;gap:25dp;padding:10dp 20dp 0;flex-shrink:0;} .postmatch-timeline-teams {width:440dp;flex-shrink:0;display:flex;flex-direction:column;font-size:28dp;} .postmatch-timeline-teams>span {height:65dp;line-height:65dp;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} .postmatch-timeline-tracks {flex:1;min-width:0;} -.postmatch-track {height:65dp;position:relative;border-bottom:1dp var(--border);background-color:var(--panel);} +.postmatch-track {height:65dp;position:relative;border-bottom:1dp var(--p-div);background-color:var(--p-row);} .postmatch .postmatch-marker {position:absolute;top:50%;transform:translate(-50%,-50%);width:48dp;height:48dp;min-width:0;padding:4dp;border:0;border-radius:10dp;opacity:.22;} .postmatch-marker.is-visible {opacity:1;} -.postmatch-ticks {display:flex;justify-content:space-between;padding-top:12dp;font-size:28dp;color:var(--muted);} +.postmatch-ticks {display:flex;justify-content:space-between;padding-top:12dp;font-size:28dp;color:var(--p-n7);} .postmatch-seek {display:flex;align-items:center;gap:25dp;padding:0 20dp;flex-shrink:0;} -.postmatch-seek>button {width:380dp;border:1dp var(--border);border-radius:12dp;background-color:var(--soft);padding:18dp;font-size:28dp;} +.postmatch-seek>button {width:380dp;border:1dp var(--p-div);border-radius:12dp;background-color:var(--p-n2);padding:18dp;font-size:28dp;} .postmatch-seek input {flex:1;min-width:0;height:50dp;margin:0;padding:0;border:0;background-color:transparent;} -.postmatch-seek>span {width:85dp;text-align:right;font-size:30dp;color:var(--accent);} -.postmatch-recorded-note {font-size:28dp;color:var(--muted);text-align:center;flex-shrink:0;} -.postmatch-fixture-nav {display:flex;justify-content:space-between;align-items:center;gap:24dp;padding-top:20dp;border-top:1dp var(--border);flex-shrink:0;} -.postmatch-fixture-nav>span {flex:1;min-width:0;font-size:28dp;text-align:center;color:var(--muted);} +.postmatch-seek>span {width:85dp;text-align:right;font-size:30dp;color:var(--p-a7);} +.postmatch-recorded-note {font-size:28dp;color:var(--p-n7);text-align:center;flex-shrink:0;} +.postmatch-fixture-nav {display:flex;justify-content:space-between;align-items:center;gap:24dp;padding-top:20dp;border-top:1dp var(--p-div);flex-shrink:0;} +.postmatch-fixture-nav>span {flex:1;min-width:0;font-size:28dp;text-align:center;color:var(--p-n7);} .postmatch-fixture-nav>button {min-height:65dp;font-size:28dp;white-space:nowrap;} .postmatch-eleven {display:flex;gap:75dp;flex:1;min-height:0;} -.postmatch-pitch {width:45%;height:100%;min-width:0;border:2dp var(--border);border-radius:26dp;background-color:#31595077;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:35dp;padding:45dp;} -.postmatch-pitch p {font-size:30dp;color:var(--text);text-align:center;} +.postmatch-pitch {width:45%;height:100%;min-width:0;border:2dp var(--p-div);border-radius:26dp;background-color:#31595077;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:35dp;padding:45dp;} +.postmatch-pitch p {font-size:30dp;color:var(--p-text);text-align:center;} .postmatch-eleven-list {flex:1;min-width:0;overflow-y:auto;padding-top:60dp;} .postmatch-eleven-list h3 {font-size:42dp;font-weight:normal;margin-bottom:35dp;} -.postmatch-eleven-list p {font-size:32dp;line-height:1.6;margin-bottom:35dp;color:var(--muted);} +.postmatch-eleven-list p {font-size:32dp;line-height:1.6;margin-bottom:35dp;color:var(--p-n7);} .postmatch-overview {display:flex;flex-direction:column;justify-content:center;gap:55dp;flex:1;min-height:0;} .postmatch-total-grid {display:flex;flex-wrap:wrap;gap:35dp;} -.postmatch-total {width:48%;flex-grow:1;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:20dp;min-height:405dp;border:1dp var(--border);border-radius:28dp;background-color:var(--panel);} +.postmatch-total {width:48%;flex-grow:1;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:20dp;min-height:405dp;border:1dp var(--p-div);border-radius:28dp;background-color:var(--p-row);} .postmatch-total strong {font-size:100dp;font-weight:normal;letter-spacing:-2dp;} .postmatch-total strong>span {display:block;} .postmatch-total>span {font-size:32dp;} -.postmatch-overview>p {font-size:28dp;color:var(--muted);text-align:center;} -.postmatch-table-note {font-size:28dp;color:var(--muted);margin-bottom:20dp;flex-shrink:0;} +.postmatch-overview>p {font-size:28dp;color:var(--p-n7);text-align:center;} +.postmatch-table-note {font-size:28dp;color:var(--p-n7);margin-bottom:20dp;flex-shrink:0;} .postmatch-table-scroll {min-height:0;flex:1;overflow-y:auto;} -.postmatch-table-row {display:flex;align-items:center;min-height:65dp;border-bottom:1dp var(--border);font-size:30dp;} +.postmatch-table-row {display:flex;align-items:center;min-height:65dp;border-bottom:1dp var(--p-div);font-size:30dp;} .postmatch-table-row>span {flex:1;min-width:0;text-align:center;} .postmatch-table-row>span:nth-child(1) {width:85dp;flex:none;} .postmatch-table-row>span:nth-child(2) {width:790dp;flex:none;text-align:left;} .postmatch-table-row>span:nth-child(7) {width:180dp;flex:none;} .postmatch-table-row .postmatch-team {font-size:29dp;gap:20dp;} -.postmatch-table-row.heading {color:var(--muted);background-color:var(--panel);} -.postmatch-table-row:nth-child(even) {background-color:var(--panel);} +.postmatch-table-row.heading {color:var(--p-n7);background-color:var(--p-row);} +.postmatch-table-row:nth-child(even) {background-color:var(--p-row);} .postmatch-dialog {width:2484dp;} .postmatch-dialog h2 {text-align:center;width:100%;} @@ -102,21 +99,86 @@ .postmatch-pitch-surface {position:absolute;overflow:hidden;border-radius:26dp;background-color:#31595077;} .postmatch-pitch-art {position:absolute;left:0;top:0;} .postmatch .postmatch-field-player {position:absolute;transform:translate(-50%,-50%);display:flex;flex-direction:column;align-items:center;gap:10dp;width:160dp;padding:0;border:0;border-radius:15dp;background-color:transparent;text-align:center;} -.postmatch-field-badge {display:flex;align-items:center;justify-content:center;width:82dp;height:82dp;border-radius:41dp;background-color:var(--panel);} +.postmatch-field-badge {display:flex;align-items:center;justify-content:center;width:82dp;height:82dp;border-radius:41dp;background-color:var(--p-row);} .postmatch-field-player strong {width:100%;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:28dp;font-weight:normal;} .postmatch-field-player strong>span {display:block;} .postmatch-eleven-list {padding-top:0;} .postmatch-eleven-list ol {padding:0;} .postmatch-eleven-notice {font-size:28dp;line-height:1.3;margin-bottom:18dp;} -.postmatch-nominee-row {display:flex;align-items:center;gap:30dp;min-height:99dp;border-bottom:1dp var(--border);padding:10dp 0;} -.postmatch-position {font-size:28dp;background-color:var(--panel);border:1dp var(--border);border-radius:12dp;padding:12dp;min-width:90dp;text-align:center;} +.postmatch-nominee-row {display:flex;align-items:center;gap:30dp;min-height:99dp;border-bottom:1dp var(--p-div);padding:10dp 0;} +.postmatch-position {font-size:28dp;background-color:var(--p-row);border:1dp var(--p-div);border-radius:12dp;padding:12dp;min-width:90dp;text-align:center;} .postmatch-nominee-copy {display:flex;flex-direction:column;gap:8dp;min-width:0;flex:1;} .postmatch .postmatch-nominee-name {border:0;padding:0;justify-content:flex-start;text-align:left;font-size:31dp;} -.postmatch .postmatch-nominee-club {display:flex;align-items:center;gap:15dp;border:0;padding:0;justify-content:flex-start;font-size:28dp;color:var(--muted);} +.postmatch .postmatch-nominee-club {display:flex;align-items:center;gap:15dp;border:0;padding:0;justify-content:flex-start;font-size:28dp;color:var(--p-n7);} .postmatch-nominee-club .live-badge {flex-shrink:0;} .postmatch-player-summary {display:flex;flex-direction:column;align-items:center;gap:28dp;text-align:center;} .postmatch-player-facts {display:flex;flex-wrap:wrap;gap:25dp;} -.postmatch-player-facts>div {width:47%;flex-grow:1;display:flex;flex-direction:column;align-items:center;gap:15dp;padding:30dp;border:1dp var(--border);border-radius:18dp;} -.postmatch-player-facts dt {font-size:30dp;color:var(--muted);} +.postmatch-player-facts>div {width:47%;flex-grow:1;display:flex;flex-direction:column;align-items:center;gap:15dp;padding:30dp;border:1dp var(--p-div);border-radius:18dp;} +.postmatch-player-facts dt {font-size:30dp;color:var(--p-n7);} .postmatch-player-facts dd {margin:0;font-size:60dp;font-weight:normal;} .postmatch-detail-result {text-align:center;margin:28dp 0;font-size:34dp;} +/* --- the evaluation as a note on the match sheet: five steps, the sheet's colours --- */ +.mv-note.pm-note {width:2475dp;height:1755dp;} +.postmatch {position:relative;left:auto;right:auto;top:auto;bottom:auto;flex:1;min-height:0;gap:20dp;font-size:29dp;line-height:38dp;} +.postmatch-heading {min-height:0;align-items:flex-end;} +.postmatch-heading>div {flex:none;} +.postmatch-heading h2 {display:block;font-family:Display;font-size:58.5dp;line-height:68dp;letter-spacing:0;} +.mv-stage .postmatch-tabs {flex:none;gap:9dp;padding:0;border-width:0dp;border-radius:0dp;background-color:transparent;} +.mv-stage .postmatch-tabs button,.mv-stage .postmatch-tabs button:hover {flex:none;height:54dp;padding:0 28dp;border:3.4dp transparent;border-radius:27dp;font-size:27dp;font-weight:bold;color:var(--p-n7);} +.mv-stage .postmatch-tabs button.done {border-color:var(--p-n4);} +.mv-stage .postmatch-tabs button.selected,.mv-stage .postmatch-tabs button.selected:hover {background-color:var(--p-n9);color:var(--p-bg);} +.pm-sub {display:flex;flex:none;align-items:center;justify-content:space-between;gap:28dp;min-height:72dp;} +.pm-sub>span {display:block;font-size:27dp;color:var(--p-n7);} +.postmatch-pickers {width:900dp;height:72dp;} +.postmatch-pickers select {height:72dp;font-size:28dp;} +.postmatch-panel {box-sizing:border-box;padding:22dp 28dp;border:3.4dp var(--p-div);border-radius:22dp;background-color:var(--p-bg);overflow:hidden;} +.postmatch-actions {gap:22dp;min-height:90dp;} +.postmatch-status {position:static;left:auto;top:auto;display:block;flex:1;width:auto;height:auto;line-height:38dp;} +#postmatch-ticker {margin-left:0;} +.mv-stage .postmatch-actions .mv-btn.primary,.mv-stage .postmatch-actions .mv-btn.primary:hover,.mv-stage .postmatch-actions .mv-btn.primary:disabled {height:90dp;border-radius:45dp;font-size:34dp;} +.mv-stage .postmatch .postmatch-result-row {border:0dp transparent;border-top:1dp var(--p-div);min-height:96dp;font-size:31dp;justify-content:flex-start;} +.postmatch-result-score {font-family:Display;font-size:42dp;} +.postmatch-results-head {padding:0 35dp 10dp;font-size:26dp;} +.mv-stage .postmatch .postmatch-event {justify-content:flex-start;text-align:left;} +.mv-stage .postmatch-fixture-nav>button,.mv-stage .postmatch-seek>button {height:64dp;padding:0 26dp;border:2dp var(--p-n5);border-radius:32dp;font-size:27dp;} +.postmatch-report-teams strong {font-family:Display;} +.postmatch-report-teams>.postmatch-report-score {font-family:Display;font-size:110dp;height:130dp;} +.postmatch-total {min-height:330dp;} +.postmatch-total strong {font-family:Display;font-size:92dp;} +.postmatch-overview {gap:36dp;} +.postmatch-eleven-list h3 {font-family:Display;} +.mv-stage .postmatch .postmatch-nominee-name,.mv-stage .postmatch .postmatch-nominee-club {justify-content:flex-start;} +.postmatch-table-row {min-height:60dp;font-size:28dp;} +.postmatch-table-row>span:nth-child(2) {width:720dp;} +.mv-note.postmatch-dialog {width:1700dp;font-size:29dp;line-height:38dp;} +.postmatch-dialog h2 {display:block;} +.postmatch-dialog h3 {display:block;margin:10dp 0 0;font-size:27dp;font-weight:bold;color:var(--p-a7);} +.postmatch-dialog footer {display:flex;justify-content:flex-end;gap:22dp;} +/* the results scale with their number: one match fills the note, two share it, three or four are large rows */ +.postmatch-results.one,.postmatch-results.two,.postmatch-results.few {display:flex;flex-direction:column;justify-content:center;gap:18dp;} +.postmatch-result-info {display:block;flex:none;text-align:center;font-size:28dp;line-height:38dp;color:var(--p-n7);} +.mv-stage .postmatch-results.one .postmatch-result-row,.mv-stage .postmatch-results.two .postmatch-result-row {flex:none;border-top-width:0dp;border-radius:22dp;padding:30dp 40dp;gap:40dp;align-items:center;} +.postmatch-results.one .postmatch-team,.postmatch-results.two .postmatch-team {flex-direction:column;gap:26dp;} +.postmatch-results.one .postmatch-team.home,.postmatch-results.two .postmatch-team.home {flex-direction:column-reverse;} +.postmatch-results.one .postmatch-team .postmatch-team-name,.postmatch-results.two .postmatch-team .postmatch-team-name {flex:none;width:100%;text-align:center;font-family:Display;white-space:normal;} +.mv-stage .postmatch-results.one .postmatch-result-row {min-height:620dp;} +.postmatch-results.one .postmatch-team .postmatch-team-name {font-size:68dp;line-height:80dp;} +.postmatch-results.one .postmatch-result-score {width:620dp;gap:44dp;font-size:260dp;line-height:280dp;} +.postmatch-results.one .postmatch-result-score .separator {font-size:150dp;} +.postmatch-results.one .postmatch-result-info {font-size:34dp;line-height:46dp;} +.mv-stage .postmatch-results.two .postmatch-result-row {min-height:400dp;} +.postmatch-results.two .postmatch-team .postmatch-team-name {font-size:48dp;line-height:58dp;} +.postmatch-results.two .postmatch-result-score {width:460dp;gap:34dp;font-size:170dp;line-height:186dp;} +.postmatch-results.two .postmatch-result-score .separator {font-size:100dp;} +.mv-stage .postmatch-results.few .postmatch-result-row {flex:none;min-height:230dp;border-radius:22dp;padding:20dp 40dp;gap:36dp;} +.postmatch-results.few .postmatch-team {gap:34dp;} +.postmatch-results.few .postmatch-team-name {font-family:Display;font-size:48dp;line-height:58dp;} +.postmatch-results.few .postmatch-result-score {width:320dp;gap:28dp;font-size:110dp;line-height:122dp;} +.postmatch-results.few .postmatch-result-score .separator {font-size:64dp;} +/* the day's totals: a large picture beside each number */ +.postmatch-total {flex-direction:row;gap:60dp;min-height:440dp;border-radius:26dp;} +.postmatch-overview {gap:24dp;} +.postmatch-total-grid {gap:26dp;} +.pm-total-copy {display:flex;flex-direction:column;align-items:flex-start;min-width:460dp;} +.postmatch-total .pm-total-copy strong {display:block;font-family:Display;font-size:150dp;line-height:160dp;letter-spacing:0;} +.postmatch-total .pm-total-copy>span {display:block;font-size:34dp;line-height:44dp;color:var(--p-n7);} diff --git a/src/modern/ui/live_screens.inc b/src/modern/ui/live_screens.inc index bd3c153..b0dc996 100644 --- a/src/modern/ui/live_screens.inc +++ b/src/modern/ui/live_screens.inc @@ -556,6 +556,10 @@ std::string App::live_card(const Json &match, const Json &frame, const std::stri } std::string App::render_live() { if(live_review_) return render_postmatch(); + return live_sheet({}); +} +// The match sheet; `over` replaces the sheet's own notes (substitution, tactics) on top of it. +std::string App::live_sheet(const std::string &over) { if (!live_.available()) return ""; if (auto *node = element("live-ticker")) live_ticker_scroll_ = live_reset_ticker_ ? 0 : node->GetScrollTop(); if (auto *node = element("live-detail-body")) live_detail_scroll_ = live_reset_detail_ ? 0 : node->GetScrollTop(); @@ -640,7 +644,7 @@ std::string App::render_live() { } out += "" + esc(live_feedback_.empty() ? (recorded ? std::string() : std::string(phase_text) + " · " + std::to_string(minute) + "′ · keine Spielwertänderung") : live_feedback_) + "" + btn(live_.finished() ? "live-review" : "live-next", live_.finished() ? "Zur Auswertung" : live_.running() ? "Nächste Minute" : "Nächste Meldung", "mv-btn primary", "id=\"" + std::string(live_.finished() ? "live-review" : "live-next") + "\"") + ""; - return out + live_dialog_markup(owner) + ""; + return out + (over.empty() ? live_dialog_markup(owner) : over) + ""; } void App::live_after_render() { if(live_review_){postmatch_after_render();return;} diff --git a/src/modern/ui/live_state.inc b/src/modern/ui/live_state.inc index 058455e..e9c5ae1 100644 --- a/src/modern/ui/live_state.inc +++ b/src/modern/ui/live_state.inc @@ -16,6 +16,7 @@ void live_update_parts(); float live_ticker_scroll_ = 0, live_detail_scroll_ = 0; std::string render_live(); + std::string live_sheet(const std::string &over); std::string live_roster(const Json &owner); std::string live_detail(const Json &owner, const Json &frame); std::string live_dialog_markup(const Json &owner); diff --git a/src/modern/ui/postmatch_controls.inc b/src/modern/ui/postmatch_controls.inc index 458a1c9..b747573 100644 --- a/src/modern/ui/postmatch_controls.inc +++ b/src/modern/ui/postmatch_controls.inc @@ -446,7 +446,7 @@ void App::postmatch_after_render() { Rml::ElementList underlay; doc_->QuerySelectorAll(underlay, "#postmatch-underlay button,#postmatch-underlay " - "input,#postmatch-underlay select,#postmatch-close"); + "input,#postmatch-underlay select"); for (auto *n : underlay) { n->SetProperty("pointer-events", "none"); n->SetAttribute("tabindex", -1); @@ -454,7 +454,7 @@ void App::postmatch_after_render() { } Rml::ElementList behind; doc_->QuerySelectorAll(behind, - ".desktop-layer button,.desktop-layer [data-action]"); + ".desktop-layer button,.desktop-layer [data-action],#live-underlay button,#live-underlay [tabindex],#live-stage .mv-bar button"); for (auto *n : behind) { n->SetProperty("pointer-events", "none"); n->SetAttribute("tabindex", -1); diff --git a/src/modern/ui/postmatch_screens.inc b/src/modern/ui/postmatch_screens.inc index 0d177cc..8b48b43 100644 --- a/src/modern/ui/postmatch_screens.inc +++ b/src/modern/ui/postmatch_screens.inc @@ -66,6 +66,29 @@ std::string App::postmatch_icon(const std::string &kind, double size) { int(size * 2)), size, size); } +// The pictures of the day's totals: drawn large and filled, in the sheet's colours. +std::string App::postmatch_art(const std::string &kind, double size) { + const bool dark = theme_ != "silver" && theme_ != "matchday"; + const std::string ink = dark ? "#f0ece2" : "#2a211a", paper = dark ? "#2a2d34" : "#fffdf6"; + const auto card = [&](const char *fill, const char *turn) { + return std::string(""; + }; + std::string g; + if (kind == "yellow") g = card("#e9c53a", "-12"); + else if (kind == "red") g = card("#c8372d", "12"); + else if (kind == "crowd") { + const auto person = [&](double x, double y, double k, const char *fill) { + return ""; + }; + g = person(26, 46, .8, "#7a8a5e") + person(74, 46, .8, "#7a8a5e") + person(50, 52, 1.05, "#c67139"); + } else { + g = ""; + } + return picture(renderer_.diagram("postmatch-art-" + kind + (dark ? "-d" : "-l"), "" + g + "", int(size * 2)), size, size); +} std::string App::postmatch_team(const Json &team, bool home, double size) { const auto name = live_text(team.value("name", "—"), "postmatch-team-name"); const auto badge = live_badge(team, size); @@ -264,75 +287,63 @@ std::string App::render_postmatch() { std::set own; for (const auto &owner : postmatch_data_.at("owners")) own.insert(owner.at("team").at("id")); - std::string body = - "

" + - live_text(selected.at("competition").get() + " · " + - ui_long_date(postmatch_data_.at("date").get())) + - "

" + - live_text(postmatch_label(postmatch_tab_)) + "

"; - if (postmatch_data_.at("role") == "club" && - postmatch_data_.at("surface") == "outdoor") { + size_t position = 0; + for (size_t i = 0; i < tabs.size(); ++i) + if (tabs[i].get() == postmatch_tab_) position = i; + std::string steps; + for (size_t i = 0; i < tabs.size(); ++i) { + const auto tab = tabs[i].get(); + steps += btn("postmatch-tab", std::to_string(i + 1) + ". " + postmatch_label(tab), + tab == postmatch_tab_ ? "selected" : i < position ? "done" : "", + "id=\"postmatch-tab-" + tab + "\" data-id=\"" + tab + "\" role=\"tab\" aria-selected=\"" + + std::string(tab == postmatch_tab_ ? "true" : "false") + "\" tabindex=\"" + std::string(tab == postmatch_tab_ ? "0" : "-1") + "\""); + } + std::string pickers; + if (postmatch_data_.at("role") == "club" && postmatch_data_.at("surface") == "outdoor") { std::vector> countries, leagues; for (const auto &g : postmatch_groups()) { const auto country = g.at("country").get(); - if (std::none_of(countries.begin(), countries.end(), - [&](const auto &c) { return c.first == country; })) + if (std::none_of(countries.begin(), countries.end(), [&](const auto &c) { return c.first == country; })) countries.emplace_back(country, g.at("country_name")); - if (country == postmatch_country_) - leagues.emplace_back(g.at("id"), g.at("name")); + if (country == postmatch_country_) leagues.emplace_back(g.at("id"), g.at("name")); } - body += ""; + pickers = ""; } - body += "
" + + esc(pg_upper("Auswertung · Schritt " + std::to_string(position + 1) + " von " + std::to_string(tabs.size()))) + + "

" + live_text(postmatch_label(postmatch_tab_)) + + "

" + + esc(selected.at("competition").get() + " · " + ui_long_date(postmatch_data_.at("date").get())) + "" + pickers + "
"; + body += "
"; if (postmatch_tab_ == "results") { - // the score board of the match day's stage, at its final whistle - if (live_.available()) - for (const auto &played : live_.fixture().at("matches")) - if (played.at("home").at("id") == selected.at("home").at("id") && played.at("away").at("id") == selected.at("away").at("id")) { - try { body += "
" + live_card(played, live_.frame(), "solo", 0) + "
"; } catch (const std::exception &) {} - break; - } - body += "
" + - live_text("Heim", "home") + live_text("Ergebnis", "score") + - live_text("Auswärts", "away") + - "
"; + // the fewer matches, the larger each is shown: one fills the note, a full match day is a list + const size_t shown = matches.size(); + const std::string scale = shown <= 1 ? "one" : shown == 2 ? "two" : shown <= 4 ? "few" : "many"; + const double badge = shown <= 1 ? 300 : shown == 2 ? 210 : shown <= 4 ? 130 : 68; + const bool hall = postmatch_data_.at("surface") == "indoor" || live_indoor(); + body += std::string(scale == "many" ? "
" + live_text("Heim", "home") + live_text("Ergebnis", "score") + live_text("Auswärts", "away") + "
" : std::string()) + + "
"; for (size_t i = 0; i < matches.size(); ++i) { const auto &m = matches[i]; const bool owned = own.contains(m.at("home").at("id")) || own.contains(m.at("away").at("id")); body += btn( "postmatch-fixture", - postmatch_team(m.at("home"), true) + + postmatch_team(m.at("home"), true, badge) + "" + live_text( std::to_string(m.at("final").at("score")[0].get())) + live_text(":", "separator") + live_text( std::to_string(m.at("final").at("score")[1].get())) + - "" + postmatch_team(m.at("away"), false), + "" + postmatch_team(m.at("away"), false, badge), "postmatch-result-row " + std::string(owned ? "postmatch-own" : ""), "id=\"postmatch-result-" + std::to_string(i) + "\" data-id=\"" + esc(m.at("id").get()) + "\""); + if (shown <= 2) body += "

" + esc(m.at("competition").get() + " · " + live_match_info_text(m, hall)) + "

"; } body += "

" + live_text(postmatch_data_.at("source") == "engine-recording" @@ -378,9 +389,8 @@ std::string App::render_postmatch() { {"red", "red", "Platzverweise"}, {"attendance", "crowd", "Zuschauer"}, {"goals", "goal", "Tore"}}}) - body += "

" + postmatch_icon(icon, 70) + - "" + live_text(postmatch_count(total.at(key))) + - "" + live_text(label) + "
"; + body += "
" + postmatch_art(icon, 310) + "
" + live_text(postmatch_count(total.at(key))) + + "" + live_text(label) + "
"; const int games = total.at("games"); body += "

" + @@ -438,20 +448,13 @@ std::string App::render_postmatch() { "

"; body += "
"; } - body += - "
" + - btn("postmatch-prev", "‹ Zurück", {}, - "id=\"postmatch-prev\" " + - std::string(position == 0 ? "disabled" : "")) + - live_text(std::to_string(position + 1) + " / " + - std::to_string(tabs.size()) + (engine_mode_ ? "" : " · UI-Aufzeichnung"), - "postmatch-status") + - btn("postmatch-ticker", "Zum Ticker", - {}, "id=\"postmatch-ticker\"") + - btn("postmatch-next", - position + 1 == tabs.size() ? (engine_mode_ ? "Zum Schreibtisch" : "Zum Desktop") : "Weiter ›", {}, - "id=\"postmatch-next\"") + - "
"; + body += "
" + + btn("postmatch-prev", "Zurück", "mv-btn", "id=\"postmatch-prev\" " + std::string(position == 0 ? "disabled" : "")) + + btn("postmatch-ticker", "Zum Ticker", "mv-btn", "id=\"postmatch-ticker\"") + + live_text(engine_mode_ ? std::string() : std::string("UI-Aufzeichnung"), "postmatch-status") + + btn("postmatch-next", position + 1 == tabs.size() ? (engine_mode_ ? "Zum Schreibtisch" : "Zum Desktop") : "Weiter", "mv-btn primary", "id=\"postmatch-next\"") + + "
"; + std::string dialog; if (!postmatch_dialog_.empty()) { Json team; const Json *nominee = nullptr, *match = nullptr; @@ -497,26 +500,22 @@ std::string App::render_postmatch() { live_text("Keine Partie dieses Teams in der gehaltenen " "Aufnahme enthalten.") + "

"; - body += + dialog = "

" + + "class=\"mv-veil\">

" + live_text(nominee ? nominee->at("player").at("name").get() : team.value("name", "Spieltagsinfo")) + "

" + detail + "
" + - btn("postmatch-detail-close", "Schließen", {}, + btn("postmatch-detail-close", "Schließen", "mv-btn", "id=\"postmatch-detail-close\"") + - btn("postmatch-detail-report", "Spielbericht", {}, + btn("postmatch-detail-report", "Spielbericht", "mv-btn primary", "id=\"postmatch-detail-report\" " + std::string(match ? "" : "disabled")) + "

"; } - // An engine career has no demo desk to draw beneath the review; its background stays. - return (engine_mode_ ? std::string() : render_desktop()) + - "
" + - btn("postmatch-desktop", "×", "close", - "id=\"postmatch-close\" aria-label=\"Auswertung schließen\"") + - "

Nach dem Spiel

" + body + - "
"; + // the evaluation is a note laid on the match sheet; the sheet beneath is not operated meanwhile + const std::string note = "
" + body + "
" + dialog; + const std::string sheet = live_sheet(note); + return sheet.empty() ? "
" + note + "
" : sheet; } diff --git a/src/modern/ui/postmatch_state.inc b/src/modern/ui/postmatch_state.inc index 96eca6c..6a04821 100644 --- a/src/modern/ui/postmatch_state.inc +++ b/src/modern/ui/postmatch_state.inc @@ -23,3 +23,4 @@ std::string postmatch_events(const Json &, const std::string &); std::string postmatch_report_markup(const Json &); std::string postmatch_icon(const std::string &, double); std::string postmatch_team(const Json &, bool, double = 68); +std::string postmatch_art(const std::string &kind, double size);