diff --git a/assets/modern/notebook.rcss b/assets/modern/notebook.rcss index 9aa7eed..216ddc4 100644 --- a/assets/modern/notebook.rcss +++ b/assets/modern/notebook.rcss @@ -321,3 +321,5 @@ body.midnight .hw-item,body.matchday .hw-item {background-color:#ffffff14;} body /* the ribbon is a button: back to the main menu */ .nb-ribbon,.nb-ribbon:hover,.nb-ribbon:focus {display:block;padding:0;margin:0;border:0dp;border-radius:0dp;background-color:transparent;decorator:none;} .nb-ribbon:hover {top:2014dp;} +.hw-venue {display:block;margin-top:8dp;font-size:30dp;font-weight:bold;line-height:40dp;white-space:nowrap;color:#8a3f1c;} +.hw-match-mid .hw-venue {text-align:center;} diff --git a/src/modern/ui/notebook_home.inc b/src/modern/ui/notebook_home.inc index 753b7a4..dbde996 100644 --- a/src/modern/ui/notebook_home.inc +++ b/src/modern/ui/notebook_home.inc @@ -172,6 +172,8 @@ std::string App::notebook_card(const std::string &type, int cols, int rows, cons return "
" + esc(text) + "" + (sub.empty() ? "" : "" + esc(sub) + "") + "
"; }; const auto tag = [](const std::string &text, bool terra = false) { return "" + esc(text) + ""; }; + // home or away: plain words, no marker behind them + const auto place = [](const std::string &text) { return "" + esc(text) + ""; }; const auto foot = [](const std::string &text) { return "" + esc(text) + ""; }; const auto lines = [](const std::vector> &rows_) { std::string out = "
"; @@ -196,13 +198,13 @@ std::string App::notebook_card(const std::string &type, int cols, int rows, cons const bool home = venue == "Heimspiel"; const auto &other = fixture.at(home ? "away" : "home"); const std::string placed = opponent.is_object() ? "Platz " + opponent.value("rank", std::string("—")) + " · Stärke " + opponent.value("strength", std::string("—")) : std::string(); - if (flat) return kicker(competition) + "
" + notebook_crest(other.at("team"), 140) + "
" + big(other.at("name").get(), 50) + tag(venue, !home) + "
"; + if (flat) return kicker(competition) + "
" + notebook_crest(other.at("team"), 140) + "
" + big(other.at("name").get(), 50) + place(venue) + "
"; if (!wide) - return kicker(competition) + "
" + notebook_crest(other.at("team"), 216) + "
" + big(other.at("name").get(), 56) + tag(venue, !home) + foot(placed); + return kicker(competition) + "
" + notebook_crest(other.at("team"), 216) + "
" + big(other.at("name").get(), 56) + place(venue) + foot(placed); const auto side = [&](const Json &team) { return "
" + notebook_crest(team.at("team"), 236) + "
" + esc(team.at("name").get()) + "
"; }; - return kicker("Nächstes Spiel · " + competition) + "
" + side(fixture.at("home")) + "
vs" + tag(venue, !home) + "
" + side(fixture.at("away")) + "
" + + return kicker("Nächstes Spiel · " + competition) + "
" + side(fixture.at("home")) + "
vs" + place(venue) + "
" + side(fixture.at("away")) + "
" + foot(placed.empty() ? std::string() : "Gegner auf " + placed); } if (type == "news") {