Slightly improved style, much improved tables

2 files changed, 103 insertions, 63 deletions

diff --git a/project/assets/css/default.css b/project/assets/css/default.css
index 8c47a6d..457a702 100644
--- a/project/assets/css/default.css
+++ b/project/assets/css/default.css
@@ -4,7 +4,7 @@
 
 body {
     margin:1em auto;
-    max-width:50em;
+    max-width:60em;
     font:1.2em/1.62em sans-serif;
 }
 
@@ -32,6 +32,33 @@ h4 {
 }
 
 
+p {
+    margin-top: 2em;
+    margin-bottom: 2em;
+}
+
+
+table, th, td {
+    border: 1px solid gray;
+}
+
+
+table {
+    margin: 2em auto 2em auto;
+    max-width: 59em;
+}
+
+
+th {
+    background-color:#CCCCCC;
+}
+
+
+td {
+    text-align: center;
+}
+
+
 
 
 /* A bunch of nonsense to make the navbar
diff --git a/project/templates/stvcount.html b/project/templates/stvcount.html
index a64f029..e44ec43 100644
--- a/project/templates/stvcount.html
+++ b/project/templates/stvcount.html
@@ -77,6 +77,7 @@ superfluous logging.</p>
 slightly from the ones provided by the AEC's official distribution of preferences. Investigations into the
 exact cause are ongoing.</p>
 
+<a name="results"></a>
 <h4>Results</h4>
 
 <p>Calculations were done for each state using the formal preference data with vacancies set to 6 instead of 12,
@@ -92,151 +93,163 @@ Q9500.</p>
 <table>
     <caption>Probable non-DD results by state</caption>
     <tr>
-        <th>NSW</th>
-        <th>VIC</th>
-        <th>QLD</th>
-        <th>SA</th>
-        <th>WA</th>
-        <th>TAS</th>
+        <th colspan="2" style="width:10em;">NSW</th>
+        <th colspan="2" style="width:10em;">VIC</th>
+        <th colspan="2" style="width:10em;">QLD</th>
+        <th colspan="2" style="width:10em;">SA</th>
+        <th colspan="2" style="width:10em;">WA</th>
+        <th colspan="2" style="width:10em;">TAS</th>
     </tr>
     <tr>
-        <td>Liberal</td>
-        <td>Liberal</td>
-        <td>Liberal National</td>
-        <td>Liberal</td>
-        <td>Liberal</td>
-        <td>Liberal</td>
+        <td style="background-color:#080CAB; width:8px">&#160;</td><td>Liberal</td>
+        <td style="background-color:#080CAB; width:8px;">&#160;</td><td>Liberal</td>
+        <td style="background-color:#1456F1; width:8px;">&#160;</td><td>Liberal National</td>
+        <td style="background-color:#080CAB; width:8px;">&#160;</td><td>Liberal</td>
+        <td style="background-color:#080CAB; width:8px;">&#160;</td><td>Liberal</td>
+        <td style="background-color:#080CAB; width:8px;">&#160;</td><td>Liberal</td>
     </tr>
     <tr>
-        <td>Labor</td>
-        <td>Labor</td>
-        <td>Labor</td>
-        <td>Labor</td>
-        <td>Labor</td>
-        <td>Labor</td>
+        <td style="background-color:#F00011; width:8px">&#160;</td><td>Labor</td>
+        <td style="background-color:#F00011; width:8px;">&#160;</td><td>Labor</td>
+        <td style="background-color:#F00011; width:8px;">&#160;</td><td>Labor</td>
+        <td style="background-color:#F00011; width:8px;">&#160;</td><td>Labor</td>
+        <td style="background-color:#F00011; width:8px;">&#160;</td><td>Labor</td>
+        <td style="background-color:#F00011; width:8px;">&#160;</td><td>Labor</td>
     </tr>
     <tr>
-        <td>Liberal</td>
-        <td>National</td>
-        <td>Liberal National</td>
-        <td>Xenophon</td>
-        <td>Liberal</td>
-        <td>Liberal</td>
+        <td style="background-color:#080CAB; width:8px">&#160;</td><td>Liberal</td>
+        <td style="background-color:green; width:8px;">&#160;</td><td>National</td>
+        <td style="background-color:#1456F1; width:8px;">&#160;</td><td>Liberal National</td>
+        <td style="background-color:#FF6300; width:8px;">&#160;</td><td>Xenophon</td>
+        <td style="background-color:#080CAB; width:8px;">&#160;</td><td>Liberal</td>
+        <td style="background-color:#080CAB; width:8px;">&#160;</td><td>Liberal</td>
     </tr>
     <tr>
-        <td>Labor</td>
-        <td>Labor</td>
-        <td>Labor</td>
-        <td>Liberal</td>
-        <td>Labor</td>
-        <td>Labor</td>
+        <td style="background-color:#F00011; width:8px">&#160;</td><td>Labor</td>
+        <td style="background-color:#F00011; width:8px;">&#160;</td><td>Labor</td>
+        <td style="background-color:#F00011; width:8px;">&#160;</td><td>Labor</td>
+        <td style="background-color:#080CAB; width:8px;">&#160;</td><td>Liberal</td>
+        <td style="background-color:#F00011; width:8px;">&#160;</td><td>Labor</td>
+        <td style="background-color:#F00011; width:8px;">&#160;</td><td>Labor</td>
     </tr>
     <tr>
-        <td>National</td>
-        <td>Green</td>
-        <td>One Nation</td>
-        <td>Labor</td>
-        <td>Green</td>
-        <td>Jacqui Lambie</td>
+        <td style="background-color:green; width:8px">&#160;</td><td>National</td>
+        <td style="background-color:#10C25B; width:8px;">&#160;</td><td>Green</td>
+        <td style="background-color:#F8F16F; width:8px;">&#160;</td><td>One Nation</td>
+        <td style="background-color:#F00011; width:8px;">&#160;</td><td>Labor</td>
+        <td style="background-color:#10C25B; width:8px;">&#160;</td><td>Green</td>
+        <td style="background-color:#E36137; width:8px;">&#160;</td><td>Jacqui Lambie</td>
     </tr>
     <tr>
-        <td>Green</td>
-        <td>Derryn Hinch</td>
-        <td>Liberal National</td>
-        <td>Xenophon</td>
-        <td>Liberal</td>
-        <td>Green</td>
+        <td style="background-color:#10C25B; width:8px">&#160;</td><td>Green</td>
+        <td style="background-color:#002F5D; width:8px;">&#160;</td><td>Derryn Hinch</td>
+        <td style="background-color:#1456F1; width:8px;">&#160;</td><td>Liberal National</td>
+        <td style="background-color:#FF6300; width:8px;">&#160;</td><td>Xenophon</td>
+        <td style="background-color:#080CAB; width:8px;">&#160;</td><td>Liberal</td>
+        <td style="background-color:#10C25B; width:8px;">&#160;</td><td>Green</td>
     </tr>
 </table>
 
 <table>
     <caption>Probable non-DD Senate composition</caption>
     <tr>
-        <th>Party</th>
-        <th>Seats Won</th>
-        <th>Continuing Senators</th>
-        <th>Total Seats</th>
-        <th>Difference from Actual</th>
+        <th colspan="2" style="width:40%">Party</th>
+        <th style="width:15%">Seats Won</th>
+        <th style="width:15%">Continuing Senators</th>
+        <th style="width:15%">Total Seats</th>
+        <th style="width:15%">Difference From Actual</th>
     </tr>
     <tr>
-        <td>Liberal/National Coalition</td>
+        <td style="background-color:#080CAB; width:8px;">&#160;</td>
+        <td style="text-align:left;">&#160;Liberal/National Coalition</td>
         <td>17</td>
         <td>15</td>
         <td>32</td>
         <td>+2</td>
     </tr>
     <tr>
-        <td>Australian Labor Party</td>
+        <td style="background-color:#F00011; width:8px;">&#160;</td>
+        <td style="text-align:left;">&#160;Australian Labor Party</td>
         <td>14</td>
         <td>10</td>
         <td>24</td>
         <td>-2</td>
     </tr>
     <tr>
-        <td>Australian Greens</td>
+        <td style="background-color:#10C25B; width:8px;">&#160;</td>
+        <td style="text-align:left;">&#160;Australian Greens</td>
         <td>4</td>
         <td>4</td>
         <td>8</td>
         <td>-1</td>
     </tr>
     <tr>
-        <td>Xenophon Group</td>
+        <td style="background-color:#FF6300; width:8px;">&#160;</td>
+        <td style="text-align:left;">&#160;Xenophon Group</td>
         <td>2</td>
         <td>1</td>
         <td>3</td>
         <td>Nil</td>
     </tr>
     <tr>
-        <td>Jacqui Lambie Network*</td>
+        <td style="background-color:#E36137; width:8px;">&#160;</td>
+        <td style="text-align:left;">&#160;Jacqui Lambie Network*</td>
         <td>1</td>
         <td>1</td>
         <td>2</td>
         <td>+1</td>
     </tr>
     <tr>
-        <td>Liberal Democratic Party</td>
+        <td style="background-color:#F9E518; width:8px;">&#160;</td>
+        <td style="text-align:left;">&#160;Liberal Democratic Party</td>
         <td>0</td>
         <td>1</td>
         <td>1</td>
         <td>Nil</td>
     </tr>
     <tr>
-        <td>Family First Party</td>
+        <td style="background-color:#00CCFF; width:8px;">&#160;</td>
+        <td style="text-align:left;">&#160;Family First Party</td>
         <td>0</td>
         <td>1</td>
         <td>1</td>
         <td>Nil</td>
     </tr>
     <tr>
-        <td>Palmer United Party*</td>
+        <td style="background-color:#FFED00; width:8px;">&#160;</td>
+        <td style="text-align:left;">&#160;Palmer United Party*</td>
         <td>0</td>
         <td>1</td>
         <td>1</td>
         <td>+1</td>
     </tr>
     <tr>
-        <td>Glenn Lazarus Team*</td>
+        <td style="background-color:gray; width:8px;">&#160;</td>
+        <td style="text-align:left;">&#160;Glenn Lazarus Team*</td>
         <td>0</td>
         <td>1</td>
         <td>1</td>
         <td>+1</td>
     </tr>
     <tr>
-        <td>Australian Motoring Enthusiast Party</td>
+        <td style="background-color:#191970; width:8px;">&#160;</td>
+        <td style="text-align:left;">&#160;Australian Motoring Enthusiast Party</td>
         <td>0</td>
         <td>1</td>
         <td>1</td>
         <td>+1</td>
     </tr>
     <tr>
-        <td>One Nation</td>
+        <td style="background-color:#F8F16F; width:8px;">&#160;</td>
+        <td style="text-align:left;">&#160;One Nation</td>
         <td>1</td>
         <td>0</td>
         <td>1</td>
         <td>-3</td>
     </tr>
     <tr>
-        <td>Derryn Hinch's Justice Party</td>
+        <td style="background-color:#002F5D; width:8px;">&#160;</td>
+        <td style="text-align:left;">&#160;Derryn Hinch's Justice Party</td>
         <td>1</td>
         <td>0</td>
         <td>1</td>
@@ -247,7 +260,7 @@ Q9500.</p>
 <p>* These three parties were all part of the Palmer United Party at the 2013/2014 election, but split up mid term.</p>
 
 <p>Surprisingly, these projected results <em>still</em> have 20 out of 76 seats held by third party candidates, despite
-the half election putting them at a disadvantage. The number of third party groups the Liberal Nationals have to
+the half election putting them at a disadvantage. The number of third party groups the Liberal/Nationals have to
 negotiate with to pass legislation (assuming Labor and Greens attempt to block) equally remains unchanged.</p> 
 
 <p>The Greens manage to do slightly worse, even though their usual position of winning the 5th or 6th seat in most states
@@ -255,8 +268,8 @@ often allows them to obtain more representation than their primary vote would ot
 attributed to a bad 2013 result, as their primary vote both then and in 2016 was nearly identical.</p>
 
 <p>One Nation's much reduced number of seats can be attributed to the inherent geographic bias that any system involving
-electing multiple candidates across multiple independent divisions introduces. If like-minded voters are all in one
-place, they receive representation, but when the same number of voters are spread out, they get nothing. When this effect
+electing candidates across many independent divisions has. If like-minded voters are all in one place, they
+receive representation, but when the same number of voters are spread out, they get nothing. When this effect
 is intentionally exploited it's called gerrymandering, but here it's merely an artifact of electing Senators from each
 state separately. One Nation's support is strongest in Queensland but is relatively diffuse. Any claims of Pauline
 Hanson being <a href="http://junkee.com/malcolm-turnbull-will-probably-need-pauline-hansons-support-to-pass-any-laws/82138"