From 9fcb643fe5355b0ec4abfe2bf4cc29a433c13543 Mon Sep 17 00:00:00 2001 From: RunasSudo Date: Mon, 14 Mar 2022 22:27:58 +1100 Subject: [PATCH] Avoid wrapping candidate names/statuses in HTML report --- html/main.css | 36 +++++++++++++++++++----------------- src/stv/wasm.rs | 6 +++--- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/html/main.css b/html/main.css index 71ed421..afb9b0c 100644 --- a/html/main.css +++ b/html/main.css @@ -1,20 +1,19 @@ -/* - pyRCV2: Preferential vote counting - Copyright © 2020–2021 Lee Yingtong Li (RunasSudo) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ +/* OpenTally: Open-source election vote counting + * Copyright © 2021–2022 Lee Yingtong Li (RunasSudo) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ @import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600&display=swap'); @@ -108,6 +107,9 @@ td.count sup { tr.stage-no td, tr.stage-kind td, tr.stage-comment td, tr.hint-papers-votes td { text-align: center; } +td.candidate-name, td.elected, td.excluded { + white-space: nowrap; +} tr.stage-kind td { font-size: 0.75em; min-width: 5rem; diff --git a/src/stv/wasm.rs b/src/stv/wasm.rs index 9031653..b4181ac 100644 --- a/src/stv/wasm.rs +++ b/src/stv/wasm.rs @@ -1,5 +1,5 @@ /* OpenTally: Open-source election vote counting - * Copyright © 2021 Lee Yingtong Li (RunasSudo) + * Copyright © 2021–2022 Lee Yingtong Li (RunasSudo) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -348,9 +348,9 @@ pub fn init_results_table(election: &Election, opts: &stv::STVOpti for candidate in election.candidates.iter() { if report_style == "votes_transposed" { - result.push_str(&format!(r#"{}"#, candidate.name)); + result.push_str(&format!(r#"{}"#, candidate.name)); } else { - result.push_str(&format!(r#"{}"#, candidate.name)); + result.push_str(&format!(r#"{}"#, candidate.name)); } }