From a0913c2d33c04369272f09ff3db66edd92d9bee4 Mon Sep 17 00:00:00 2001
From: RunasSudo <runassudo@yingtongli.me>
Date: Tue, 5 Jan 2021 20:28:31 +1100
Subject: [PATCH] Ditto

---
 html/index.html | 35 ++++++++++++-----------------------
 html/main.css   | 16 +++++++++-------
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/html/index.html b/html/index.html
index 07d500c..f2d1f90 100644
--- a/html/index.html
+++ b/html/index.html
@@ -27,7 +27,6 @@
 		<div class="menudiv">
 			<input type="file" id="bltFile">
 			<button onclick="clickCount()">Count</button>
-			<i class="sep"></i>
 			<label>
 				Preset:
 				<select id="selPreset" onchange="changePreset()">
@@ -39,15 +38,13 @@
 					<option value="ers97">ERS97</option>
 				</select>
 			</label>
-			<i class="sep"></i>
 			<button id="btnAdvancedOptions" onclick="clickAdvancedOptions()">Show advanced options</button>
 			<!--GITREV-->
-			<i class="sep"></i>
 			<a href="https://yingtongli.me/blog/2020/12/24/pyrcv2.html">Information and instructions</a>
 		</div>
 		
 		<div id="divAdvancedOptions" class="menudiv" style="display: none;">
-			<label>
+			<label class="padafter">
 				Numbers:
 				<select id="selNumbers">
 					<option value="native">Native</option>
@@ -55,7 +52,6 @@
 					<option value="fixed" selected>Fixed</option>
 				</select>
 			</label>
-			<i class="sep"></i>
 			<label>
 				Decimal places (if Numbers = Fixed):
 				<input type="number" id="txtDP" value="5" style="width: 3em;">
@@ -76,25 +72,22 @@
 					<option value="hare_exact">Hare (exact)</option>
 				</select>
 			</label>
-			<label>
+			<label class="padafter">
 				<select id="selQuotaMode">
 					<option value="static" selected>Static quota</option>
 					<option value="progressive">Progressive quota</option>
 					<option value="ers97">Static with ERS97 rules</option>
 				</select>
 			</label>
-			<i class="sep"></i>
-			<label>
+			<label class="padafter">
 				<input type="checkbox" id="chkBulkElection" checked>
 				Bulk election
 			</label>
-			<i class="sep"></i>
-			<label>
+			<label class="padafter">
 				<input type="checkbox" id="chkBulkExclusion">
 				Bulk exclusion
 			</label>
-			<i class="sep"></i>
-			<label>
+			<label class="padafter">
 				<input type="checkbox" id="chkDeferSurpluses">
 				Defer surpluses
 			</label>
@@ -103,29 +96,26 @@
 				<input type="checkbox" id="chkRoundQuota" checked>
 				Round quota to
 			</label>
-			<label>
+			<label class="padafter">
 				<input type="number" id="txtRoundQuota" value="0" min="0" style="width: 3em;">
 				d.p.
 			</label>
-			<i class="sep"></i>
 			<label>
 				<input type="checkbox" id="chkRoundVotes">
 				Round votes to
 			</label>
-			<label>
+			<label class="padafter">
 				<input type="number" id="txtRoundVotes" value="0" min="0" style="width: 3em;">
 				d.p.
 			</label>
-			<i class="sep"></i>
 			<label>
 				<input type="checkbox" id="chkRoundTVs">
 				Round transfer values to
 			</label>
-			<label>
+			<label class="padafter">
 				<input type="number" id="txtRoundTVs" value="0" min="0" style="width: 3em;">
 				d.p.
 			</label>
-			<i class="sep"></i>
 			<label>
 				<input type="checkbox" id="chkRoundWeights">
 				Round ballot weights to
@@ -135,14 +125,13 @@
 				d.p.
 			</label>
 			<br>
-			<label>
+			<label class="padafter">
 				Surplus order:
 				<select id="selSurplus">
 					<option value="size" selected>By size</option>
 					<option value="order">By order</option>
 				</select>
 			</label>
-			<i class="sep"></i>
 			<label>
 				Method:
 				<select id="selTransfers">
@@ -152,13 +141,14 @@
 					<option value="wright">Wright STV</option>
 				</select>
 			</label>
-			<label>
+			<label class="padafter">
 				<select id="selPapers">
 					<option value="both" selected>Include non-transferable papers</option>
 					<option value="transferable">Use transferable papers only</option>
 				</select>
 			</label>
 			<label>
+				Exclusion:
 				<select id="selExclusion">
 					<option value="one_round" selected>Exclude in one round</option>
 					<option value="parcels_by_order">Exclude by parcel (by order)</option>
@@ -168,7 +158,7 @@
 				</select>
 			</label>
 			<br>
-			<label>
+			<label class="padafter">
 				Ties:
 				<select id="selTies">
 					<option value="backwards_random" selected>Backwards then random</option>
@@ -177,7 +167,6 @@
 					<option value="prompt">Prompt</option>
 				</select>
 			</label>
-			<i class="sep"></i>
 			<label>
 				Random seed:
 				<input type="text" id="txtSeed" value="">
diff --git a/html/main.css b/html/main.css
index 0f96094..5012a91 100644
--- a/html/main.css
+++ b/html/main.css
@@ -26,11 +26,6 @@ body {
 
 /* Menu styling */
 
-i.sep::after {
-	content: "•";
-	color: #ccc;
-}
-
 .menudiv {
 	border-bottom: 1px solid #ccc;
 	line-height: 1.8;
@@ -117,10 +112,10 @@ input[type="file"]::file-selector-button {
 	padding: 2px 10px;
 }
 button:hover, input[type="file"]::file-selector-button:hover {
-	background-color: #eaeaea;
+	background-color: #f5f5f5;
 }
 button:active, input[type="file"]::file-selector-button:active {
-	background-color: #dfdfdf;
+	background-color: #eaeaea;
 	border-color: #999 #bbb #ddd;
 }
 
@@ -146,3 +141,10 @@ button:focus, select:focus, input:focus {
 select:focus, input:focus {
 	border-color: #3daee9;
 }
+
+label {
+	white-space: nowrap;
+}
+label.padafter {
+	margin-right: 1.5em;
+}