diff --git a/assets/modern/notebook.rcss b/assets/modern/notebook.rcss index 0b52bb8..0159af4 100644 --- a/assets/modern/notebook.rcss +++ b/assets/modern/notebook.rcss @@ -269,3 +269,52 @@ body.midnight .hw-item,body.matchday .hw-item {background-color:#ffffff14;} body .hw-match-mid {display:flex;flex-direction:column;align-items:center;width:30%;} .hw-versus {display:flex;align-items:center;justify-content:center;line-height:60dp;margin:0 0 18dp 0;} .hw-match-mid .hw-versus {display:block;line-height:120dp;font-size:52dp;font-weight:normal;} + +/* --- Third pass: no dark fields on the light paper (the cards keep the tone of the design), + and larger type inside the cards. --- */ +.hw {background-color:#ebddc5;border:0dp;border-bottom:4dp #2e2b2524;} +.hw.link:hover {background-color:#efe3cd;} +.hw.hero,.hw.hero.link:hover {border:0dp;border-bottom:4dp #2e2b2524;background-color:#ebddc5;decorator:none;color:#201e1d;} +.hw.hero.link:hover {background-color:#efe3cd;} +.hw.hero .hw-kicker {color:#8c491a;} +.hw.hero .hw-foot,.hw.hero .hw-big span,.hw.hero .hw-empty {color:#474238;} +.hw.hero .hw-match-side strong {color:#201e1d;font-size:46dp;line-height:52dp;} +.hw-disc {border:6dp #f9f4ed;background-color:#f9f4ed;} +.hw-dash {padding:0;border-radius:0dp;background-color:transparent;} +.hw-dash .hw-lamp {height:86dp;} +.hw-dash.row .hw-lamp {height:76dp;} +.hw-dash .hw-lamp-text strong {color:#201e1d;} +.hw-dash .hw-lamp-text small {color:#474238;} +.hw-lamp-dot {border:5dp #f9f4ed;decorator:radial-gradient(circle at 35% 30%,#ccdbb2 0%,#8fa073 55%,#56633f 100%);} +.hw-lamp.alert .hw-lamp-dot {border-color:#f9f4ed;decorator:radial-gradient(circle at 35% 30%,#d67f48 0%,#8c491a 55%,#402310 100%);} +.hw-lamp.unknown .hw-lamp-dot {border-color:#a19786;decorator:radial-gradient(circle at 35% 30%,#eee7db 0%,#c0b6a5 55%,#82796a 100%);} +.hw.sage,.hw.sage.link:hover {background-color:#ebddc5;} +.hw-cal-band {background-color:#d67f48;} +.hw-cal-hole {background-color:#f9f4ed;} +.hw-item {background-color:#f9f4ed;} +.hw.photo,.hw.photo.link:hover {border:0dp;border-bottom:5dp #2e2b2524;} +/* type */ +.hw-kicker {height:38dp;line-height:38dp;font-size:28dp;} +.hw-tag {font-size:29dp;line-height:42dp;} +.hw-line {height:66dp;line-height:64dp;font-size:33dp;} +.hw-foot {height:42dp;line-height:42dp;font-size:29dp;} +.hw-big span {font-size:31dp;line-height:40dp;} +.hw-item {height:76dp;} +.hw-item strong {height:44dp;line-height:44dp;font-size:31dp;} +.hw-item small {font-size:27dp;} +.hw-lamp-text strong {height:42dp;line-height:42dp;font-size:33dp;} +.hw-lamp-text small {height:34dp;line-height:34dp;font-size:27dp;} +.hw-chip {font-size:36dp;} +.hw-chip-col small {height:48dp;line-height:48dp;font-size:31dp;} +.hw-cal-month {font-size:31dp;} +.hw-cal-week {font-size:42dp;line-height:50dp;} +.hw-meter span {font-size:32dp;} +.hw-meter strong {font-size:44dp;} +.hw-meter-track,.hw-meter-track div {height:26dp;border-radius:13dp;} +.hw-ticket-stub {font-size:28dp;} +.hw-ticket-price {font-size:42dp;} +.hw-photo-caption {font-size:32dp;} +.hw-chart-label span {font-size:28dp;} +.hw-chart-label.now span {font-size:46dp;} +.hw-empty {font-size:32dp;line-height:42dp;} +.hw-duel small {font-size:30dp;} diff --git a/src/modern/ui/notebook_home.inc b/src/modern/ui/notebook_home.inc index c9134e4..5e9a9e0 100644 --- a/src/modern/ui/notebook_home.inc +++ b/src/modern/ui/notebook_home.inc @@ -196,9 +196,9 @@ 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"), 106) + "
" + big(other.at("name").get(), 46) + tag(venue, !home) + "
"; + if (flat) return kicker(competition) + "
" + notebook_crest(other.at("team"), 106) + "
" + big(other.at("name").get(), 50) + tag(venue, !home) + "
"; if (!wide) - return kicker(competition) + "
" + notebook_crest(other.at("team"), 164) + "
" + big(other.at("name").get(), 50) + tag(venue, !home) + foot(placed); + return kicker(competition) + "
" + notebook_crest(other.at("team"), 164) + "
" + big(other.at("name").get(), 56) + tag(venue, !home) + foot(placed); const auto side = [&](const Json &team) { return "
" + notebook_crest(team.at("team"), 178) + "
" + esc(team.at("name").get()) + "
"; }; @@ -237,8 +237,8 @@ std::string App::notebook_card(const std::string &type, int cols, int rows, cons const std::string ticket = m.at("ticket").is_string() ? btn(text_of("ticket_action"), "Eintritt" + esc(text_of("ticket")) + "", "hw-ticket", "id=\"account-ticket\" data-interactive=\"true\" aria-label=\"Eintrittspreis ändern\"") : std::string(); - if (flat) return kicker("Vereinskasse") + big(text_of("cash"), 54) + ticket; - return kicker("Vereinskasse") + big(text_of("cash"), 62) + lines({{"Sparbuch", m.at("savings").is_string() ? text_of("savings") : "—"}}) + "
" + ticket; + if (flat) return kicker("Vereinskasse") + big(text_of("cash"), 60) + ticket; + return kicker("Vereinskasse") + big(text_of("cash"), 70) + lines({{"Sparbuch", m.at("savings").is_string() ? text_of("savings") : "—"}}) + "
" + ticket; } if (type == "warnings") { if (m.at("warnings").empty()) return {}; @@ -246,7 +246,7 @@ std::string App::notebook_card(const std::string &type, int cols, int rows, cons int alerts = 0; for (const auto &lamp : m.at("warnings")) alerts += lamp.at("attention").is_boolean() && lamp.at("attention").get(); std::string out = kicker(alerts ? "Warnlampen · " + std::to_string(alerts) + (alerts == 1 ? " leuchtet" : " leuchten") : "Warnlampen · alles ruhig") + "
"; - const double dot = flat ? 52 : wide ? 54 : 44; + const double dot = flat ? 56 : wide ? 60 : 52; for (const auto &lamp : m.at("warnings")) { const auto &attention = lamp.at("attention"); const bool alert = attention.is_boolean() && attention.get(); @@ -294,7 +294,7 @@ std::string App::notebook_card(const std::string &type, int cols, int rows, cons if (!rows_.is_array() || rows_.empty()) return kicker("Letzte Spiele") + "
Noch kein Spiel gespielt.
"; int won = 0, drawn = 0, lost = 0; const size_t count = std::min(rows_.size(), 6); - const double chip = std::min(96.0, (inner_w - (double(count) - 1) * 13) / double(count)); + const double chip = std::min(104.0, (inner_w - (double(count) - 1) * 13) / double(count)); std::string chips = "
"; for (size_t i = rows_.size() - count; i < rows_.size(); ++i) { const auto form = rows_[i].value("form", std::string("U")); @@ -332,7 +332,7 @@ std::string App::notebook_card(const std::string &type, int cols, int rows, cons const auto strength = team.value("strength", std::string("—")); int value = 0; try { value = std::stoi(strength); } catch (const std::exception &) {} - return kicker(team.value("name", std::string())) + big("Platz " + team.value("rank", std::string("—")), 58) + "
Stärke
Stärke
" + esc(strength) + "
"; } if (type == "duels") {