diff --git a/assets/modern/lineup.rcss b/assets/modern/lineup.rcss index cd1cb85..d0246a8 100644 --- a/assets/modern/lineup.rcss +++ b/assets/modern/lineup.rcss @@ -4,7 +4,13 @@ .lineup-roster-scroll {position:absolute;left:0;top:48dp;width:2612dp;height:1168dp;overflow-x:hidden;overflow-y:auto;} .lineup-row {display:flex;width:2612dp;height:56dp;border-bottom:1dp #c5d9e712;align-items:center;font-size:30dp;} .lineup-row.even {background-color:#e3edf605;} -.lineup-row.selected {background-color:var(--selected);border-left-width:0;} +.lineup-row {border-left:8dp transparent;} +.lineup-roster-scroll .lineup-row.starter {background-color:#4f9a6a1f;border-left-color:var(--win);} +.lineup-roster-scroll .lineup-row.starter.even {background-color:#4f9a6a2b;} +.lineup-roster-scroll .lineup-row.bench {background-color:#4f7fb01c;border-left-color:#5b88b8;} +.lineup-roster-scroll .lineup-row.bench.even {background-color:#4f7fb028;} +.lineup-roster-scroll .lineup-row.stand {color:var(--muted);} +.lineup-roster-scroll .lineup-row.selected,.lineup-roster-scroll .lineup-row.selected.even {background-color:var(--selected);} .lineup-row.reserve-start {margin-top:12dp;} .lineup-cell {display:flex;align-items:center;justify-content:center;flex-shrink:0;width:160.888889dp;height:54dp;padding:0 6dp;border:0;background-color:transparent;border-radius:0;white-space:nowrap;overflow:hidden;min-width:0;} .lineup-cell.control-button:hover {background-color:var(--hover);} diff --git a/assets/modern/news.rcss b/assets/modern/news.rcss index 4680089..490c7c2 100644 --- a/assets/modern/news.rcss +++ b/assets/modern/news.rcss @@ -8,7 +8,7 @@ .news-layout {position:absolute;left:0;right:0;top:0;bottom:0;color:var(--text);} .news-masthead {position:absolute;left:6dp;right:6dp;top:0;height:180dp;padding-bottom:34dp;display:flex;align-items:center;justify-content:space-between;gap:36dp;} .news-brand {display:flex;align-items:center;gap:34dp;min-width:0;} -.news-wordmark {padding:8dp 24dp 15dp;border:2dp #ff8c8c25;border-radius:15dp;background-color:#c92736;color:#fff6f4;font-size:86dp;font-weight:bold;font-style:italic;letter-spacing:-5dp;line-height:1;} +.news-wordmark {padding:10dp 26dp 16dp;border-top:6dp var(--text);border-bottom:2dp var(--text);border-radius:0dp;background-color:transparent;color:var(--text);font-family:Display;font-size:76dp;font-weight:bold;letter-spacing:-1dp;line-height:1;} .news-brand p {margin-bottom:12dp;color:var(--muted);font-size:28dp;letter-spacing:2dp;} .news-brand h2 {font-size:48dp;line-height:1.1;font-weight:normal;letter-spacing:-1dp;} .news-owner {display:flex;align-items:center;gap:24dp;min-width:0;} diff --git a/assets/modern/reports.rcss b/assets/modern/reports.rcss index 6cdb7d0..efc6820 100644 --- a/assets/modern/reports.rcss +++ b/assets/modern/reports.rcss @@ -10,6 +10,14 @@ .report-cell.first {justify-content:flex-start;} .report-cell.score {justify-content:center;} .report-cell.form {font-size:33dp;letter-spacing:1dp;} +.report-row {border-left:8dp transparent;} +.report-row.own {background-color:var(--selected);border-left-color:var(--accent);} +.report-row.own .report-value {font-weight:bold;} +.report-form {display:flex;align-items:center;gap:7dp;} +.form-mark {display:block;width:22dp;height:22dp;border-radius:11dp;background-color:var(--draw);} +.form-mark.won {background-color:var(--win);} +.form-mark.lost {background-color:var(--loss);} +.form-mark.none {width:22dp;height:6dp;border-radius:3dp;background-color:var(--border);} .report-value {display:block;white-space:nowrap;} .report-club-button {display:flex;align-items:center;gap:14dp;max-width:100%;min-width:0;padding:2dp 6dp;border:0dp;border-radius:0dp;background-color:transparent;font-size:36dp;} .report-club-button .image-frame {flex-shrink:0;} diff --git a/src/modern/ui/lineup_screens.inc b/src/modern/ui/lineup_screens.inc index 38f8ad6..368d4cc 100644 --- a/src/modern/ui/lineup_screens.inc +++ b/src/modern/ui/lineup_screens.inc @@ -202,7 +202,9 @@ std::string App::render_lineup() { for (const auto &row : rows) { const auto slot = row.at("slot").get(); const auto id = row.at("id").get(); + // starters, the bench and the rest of the squad each have their own ground out += "
"; out += "" + diff --git a/src/modern/ui/news_screens.inc b/src/modern/ui/news_screens.inc index 58498b4..a3199f7 100644 --- a/src/modern/ui/news_screens.inc +++ b/src/modern/ui/news_screens.inc @@ -131,7 +131,7 @@ std::string App::render_news() { std::string content = "
kicker

" + std::string(engine_mode_ ? "" : "DEIN SPIELJOURNAL") + "

Nachrichten

Dreierpack

" + std::string(engine_mode_ ? "" : "DEIN SPIELJOURNAL") + "

Nachrichten

" + esc(data.at("club_name").get()) + "

" + esc(data.at("date").get()) + "

" + diff --git a/src/modern/ui/reports_screens.inc b/src/modern/ui/reports_screens.inc index a1dabdc..2bbee34 100644 --- a/src/modern/ui/reports_screens.inc +++ b/src/modern/ui/reports_screens.inc @@ -119,9 +119,17 @@ std::string App::render_reports(const std::string &mode) { body += "
"; for (size_t i = 0; i < rows.size(); ++i) { const auto &row = rows[i]; - body += "
find("clubs", row_club); club && !club->value("crest", "").empty()) own_colour = renderer_.crest_colour(club->value("crest", "")); + body += "
"; + "\" style=\"height:" + scalar(row_height) + "dp;" + (own_colour.empty() ? "" : "border-left-color:" + own_colour + ";") + "\">"; for (size_t column = 0; column < headings.size(); ++column) { body += "
(); body+="
"+esc(value)+""+(detail.empty()?"":""+esc(detail)+"")+"
"; + } else if (!matches && !strengths && column == 5) { + // the last matches as marks: won, drawn, lost, not played + body += ""; + for (const char c : value) + body += std::string(""; + body += ""; } else body += "" + esc(value) + ""; } body += "
"; diff --git a/tests/modern_control_layout_tests.cpp b/tests/modern_control_layout_tests.cpp index 70cc9b6..dc8f374 100644 --- a/tests/modern_control_layout_tests.cpp +++ b/tests/modern_control_layout_tests.cpp @@ -217,6 +217,15 @@ int main(int argc, char **argv) try { Rml::Style::FontStyle::Italic, Rml::Style::FontWeight::Bold), "Bold italic font missing"); + // the display serif of headings and the news masthead ships with the assets + require(Rml::LoadFontFace((root / "fonts" / "SourceSerif4-Regular.ttf").string(), "Display", + Rml::Style::FontStyle::Normal, + Rml::Style::FontWeight::Normal), + "Display font missing"); + require(Rml::LoadFontFace((root / "fonts" / "SourceSerif4-Semibold.ttf").string(), "Display", + Rml::Style::FontStyle::Normal, + Rml::Style::FontWeight::Bold), + "Display bold font missing"); std::ostringstream css; for (const auto *name : {"theme.rcss", "ticket.rcss", "sports.rcss", "calendar.rcss", "reports.rcss", "report_details.rcss", @@ -271,7 +280,7 @@ int main(int argc, char **argv) try { "
" + button_markup("club-detail", "Synthetic source club", "report-club-button statistics-club name-first") + "
" + - "kicker" + + "Dreierpack" + "
" + "
Sample winner
" + button_markup("statistics-curve", "Mannschaftsstärke",