From fc8534d33986eb091c6fe67c653737b7e72dcd29 Mon Sep 17 00:00:00 2001 From: David Benque Date: Tue, 18 Apr 2023 17:27:23 +0100 Subject: [PATCH] Style condorcet results --- www/form/app-form.less | 6 ++++++ www/form/inner.js | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/www/form/app-form.less b/www/form/app-form.less index ccc037c86..fe06b8abc 100644 --- a/www/form/app-form.less +++ b/www/form/app-form.less @@ -679,6 +679,12 @@ line-height: 31px; } } + .cp-form-result-details { + margin: 10px 0px; + &> * { + margin-right: 0.5em; + } + } &.editable { &:not(.nodrag) { cursor: grab; } .cp-form-edit-save { diff --git a/www/form/inner.js b/www/form/inner.js index 13fe80064..903975d52 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -76,10 +76,10 @@ define([ ) { - Messages.form_showCondorcetMethod = "Condorcet method "; //XXX; + Messages.form_showCondorcetMethod = "Condorcet method"; //XXX; Messages.form_condorcetSchulze = "Schulze"; Messages.form_condorcetRanked = "Ranked Pairs"; - Messages.form_showCondorcetWinner = " winner: "; + Messages.form_showCondorcetWinner = "winner: "; Messages.form_showDetails = "Details"; Messages.form_condorcetExtendedDisplay = "Number of matches won by each candidate: "; Messages.form_noCondorcetWinner = "No winner"; @@ -2986,7 +2986,12 @@ define([ $('#dD').replaceWith(h('details', h('summary', Messages.form_showDetails), {id: 'dD'}, Messages.form_condorcetExtendedDisplay, h('div', calculateCondorcet()[1].join(', ')))); }); - condorcetWinnerDiv.append(h('div', Messages.form_showCondorcetMethod, method, Messages.form_showCondorcetWinner, condorcetWinner, detailsDiv, {style: {margin: '10px'}})); + condorcetWinnerDiv.append(h('div.cp-form-result-details', [ + h('span', Messages.form_showCondorcetMethod), + method, + h('span', Messages.form_showCondorcetWinner, condorcetWinner), + detailsDiv + ])); }