summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--project/assets/css/about.css14
-rw-r--r--project/assets/css/default.css32
-rw-r--r--project/assets/css/index.css12
-rw-r--r--project/assets/css/stvcount.css29
-rw-r--r--project/templates/about.html26
-rw-r--r--project/templates/adapad.html1
-rw-r--r--project/templates/base.html2
-rw-r--r--project/templates/grasp.html1
-rw-r--r--project/templates/index.html26
-rw-r--r--project/templates/stvcount.html41
-rw-r--r--project/templates/thue2a.html1
11 files changed, 126 insertions, 59 deletions
diff --git a/project/assets/css/about.css b/project/assets/css/about.css
new file mode 100644
index 0000000..eb2d3c1
--- /dev/null
+++ b/project/assets/css/about.css
@@ -0,0 +1,14 @@
+
+
+table {
+ margin-top: 2em;
+ margin-bottom: 2em;
+}
+
+
+td {
+ padding-left: 1em;
+ padding-right: 1em;
+}
+
+
diff --git a/project/assets/css/default.css b/project/assets/css/default.css
index 457a702..38cc432 100644
--- a/project/assets/css/default.css
+++ b/project/assets/css/default.css
@@ -38,27 +38,6 @@ p {
}
-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
@@ -86,14 +65,3 @@ nav ul li {
}
-
-
-/* Formatting the index list differently
- from regular lists. */
-
-ul.index {
- text-align: center;
- list-style-type: none;
- margin-top: 1.5cm;
-}
-
diff --git a/project/assets/css/index.css b/project/assets/css/index.css
new file mode 100644
index 0000000..7257410
--- /dev/null
+++ b/project/assets/css/index.css
@@ -0,0 +1,12 @@
+
+
+/* Formatting the index list differently
+ from regular lists. */
+
+ul.index {
+ text-align: center;
+ list-style-type: none;
+ margin-top: 1.5cm;
+}
+
+
diff --git a/project/assets/css/stvcount.css b/project/assets/css/stvcount.css
new file mode 100644
index 0000000..ac98521
--- /dev/null
+++ b/project/assets/css/stvcount.css
@@ -0,0 +1,29 @@
+
+
+table, th, td {
+ border: 1px solid gray;
+}
+
+
+table {
+ margin: 2em auto 2em auto;
+ max-width: 59em;
+}
+
+
+th {
+ background-color:#CCCCCC;
+}
+
+
+td {
+ text-align: center;
+}
+
+
+td.left {
+ text-align: left;
+ padding-left: 1em;
+}
+
+
diff --git a/project/templates/about.html b/project/templates/about.html
index 3079224..55c7f36 100644
--- a/project/templates/about.html
+++ b/project/templates/about.html
@@ -1,8 +1,18 @@
{% extends "base.html" %}
+
+
{% block title %}About{% endblock %}
+
+
+{% block style %}
+ <link href="/css/about.css" rel="stylesheet">
+{% endblock %}
+
+
+
{% block content %}
<h4>About Me</h4>
@@ -31,9 +41,17 @@ really not cut out for research. My mindset is too focused on solving problems.
<h4>Contact</h4>
-<p>
-Email: TBA<br>
-IRC: jedb on irc.freenode.net
-</p>
+<table>
+ <tr>
+ <td>Email:</td>
+ <td>contact@<span style="display:none">REMOVETHIS</span>jedbarber.id.au</td>
+ </tr>
+ <tr>
+ <td>IRC:</td>
+ <td>jedb on irc.freenode.net</td>
+ </tr>
+</table>
{% endblock %}
+
+
diff --git a/project/templates/adapad.html b/project/templates/adapad.html
index a534c2d..be25618 100644
--- a/project/templates/adapad.html
+++ b/project/templates/adapad.html
@@ -51,3 +51,4 @@ progresses.</p>
{% endblock %}
+
diff --git a/project/templates/base.html b/project/templates/base.html
index cd9dc01..090dc5c 100644
--- a/project/templates/base.html
+++ b/project/templates/base.html
@@ -4,6 +4,8 @@
<meta charset="utf-8">
<title>{% block title %}{% endblock %}</title>
<link href="/css/default.css" rel="stylesheet">
+ {% block style %}
+ {% endblock %}
</head>
<body>
<h2>Jedidiah Barber's Personal Site</h2>
diff --git a/project/templates/grasp.html b/project/templates/grasp.html
index 7919547..534ecbe 100644
--- a/project/templates/grasp.html
+++ b/project/templates/grasp.html
@@ -68,3 +68,4 @@ comprehensible graph image is found, a parser for it may be added.</p>
{% endblock %}
+
diff --git a/project/templates/index.html b/project/templates/index.html
index de16dbf..4652567 100644
--- a/project/templates/index.html
+++ b/project/templates/index.html
@@ -1,13 +1,27 @@
{% extends "base.html" %}
+
+
{% block title %}Jedidiah Barber's Personal Site{% endblock %}
+
+
+{% block style %}
+ <link href="/css/index.css" rel="stylesheet">
+{% endblock %}
+
+
+
{% block content %}
- <ul class="index">
- <li><a href="/stvcount.html">Single Transferable Vote Counter</a></li>
- <li><a href="/adapad.html">Adapad</a></li>
- <li><a href="/grasp.html">Grasp Interpreter</a></li>
- <li><a href="/thue2a.html">Thue Version 2a</a></li>
- </ul>
+
+<ul class="index">
+ <li><a href="/stvcount.html">Single Transferable Vote Counter</a></li>
+ <li><a href="/adapad.html">Adapad</a></li>
+ <li><a href="/grasp.html">Grasp Interpreter</a></li>
+ <li><a href="/thue2a.html">Thue Version 2a</a></li>
+</ul>
+
{% endblock %}
+
+
diff --git a/project/templates/stvcount.html b/project/templates/stvcount.html
index e44ec43..39f87d1 100644
--- a/project/templates/stvcount.html
+++ b/project/templates/stvcount.html
@@ -7,6 +7,12 @@
+{% block style %}
+ <link href="/css/stvcount.css" rel="stylesheet">
+{% endblock %}
+
+
+
{% block content %}
<h4>Single Transferable Vote Counter</h4>
@@ -153,15 +159,15 @@ Q9500.</p>
<table>
<caption>Probable non-DD Senate composition</caption>
<tr>
- <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>
+ <th colspan="2" style="width:24em">Party</th>
+ <th style="width:9em">Seats Won</th>
+ <th style="width:9em">Continuing Senators</th>
+ <th style="width:9em">Total Seats</th>
+ <th style="width:9em">Difference From Actual</th>
</tr>
<tr>
<td style="background-color:#080CAB; width:8px;">&#160;</td>
- <td style="text-align:left;">&#160;Liberal/National Coalition</td>
+ <td class="left">Liberal/National Coalition</td>
<td>17</td>
<td>15</td>
<td>32</td>
@@ -169,7 +175,7 @@ Q9500.</p>
</tr>
<tr>
<td style="background-color:#F00011; width:8px;">&#160;</td>
- <td style="text-align:left;">&#160;Australian Labor Party</td>
+ <td class="left">Australian Labor Party</td>
<td>14</td>
<td>10</td>
<td>24</td>
@@ -177,7 +183,7 @@ Q9500.</p>
</tr>
<tr>
<td style="background-color:#10C25B; width:8px;">&#160;</td>
- <td style="text-align:left;">&#160;Australian Greens</td>
+ <td class="left">Australian Greens</td>
<td>4</td>
<td>4</td>
<td>8</td>
@@ -185,7 +191,7 @@ Q9500.</p>
</tr>
<tr>
<td style="background-color:#FF6300; width:8px;">&#160;</td>
- <td style="text-align:left;">&#160;Xenophon Group</td>
+ <td class="left">Xenophon Group</td>
<td>2</td>
<td>1</td>
<td>3</td>
@@ -193,7 +199,7 @@ Q9500.</p>
</tr>
<tr>
<td style="background-color:#E36137; width:8px;">&#160;</td>
- <td style="text-align:left;">&#160;Jacqui Lambie Network*</td>
+ <td class="left">Jacqui Lambie Network*</td>
<td>1</td>
<td>1</td>
<td>2</td>
@@ -201,7 +207,7 @@ Q9500.</p>
</tr>
<tr>
<td style="background-color:#F9E518; width:8px;">&#160;</td>
- <td style="text-align:left;">&#160;Liberal Democratic Party</td>
+ <td class="left">Liberal Democratic Party</td>
<td>0</td>
<td>1</td>
<td>1</td>
@@ -209,7 +215,7 @@ Q9500.</p>
</tr>
<tr>
<td style="background-color:#00CCFF; width:8px;">&#160;</td>
- <td style="text-align:left;">&#160;Family First Party</td>
+ <td class="left">Family First Party</td>
<td>0</td>
<td>1</td>
<td>1</td>
@@ -217,7 +223,7 @@ Q9500.</p>
</tr>
<tr>
<td style="background-color:#FFED00; width:8px;">&#160;</td>
- <td style="text-align:left;">&#160;Palmer United Party*</td>
+ <td class="left">Palmer United Party*</td>
<td>0</td>
<td>1</td>
<td>1</td>
@@ -225,7 +231,7 @@ Q9500.</p>
</tr>
<tr>
<td style="background-color:gray; width:8px;">&#160;</td>
- <td style="text-align:left;">&#160;Glenn Lazarus Team*</td>
+ <td class="left">Glenn Lazarus Team*</td>
<td>0</td>
<td>1</td>
<td>1</td>
@@ -233,7 +239,7 @@ Q9500.</p>
</tr>
<tr>
<td style="background-color:#191970; width:8px;">&#160;</td>
- <td style="text-align:left;">&#160;Australian Motoring Enthusiast Party</td>
+ <td class="left">Australian Motoring Enthusiast Party</td>
<td>0</td>
<td>1</td>
<td>1</td>
@@ -241,7 +247,7 @@ Q9500.</p>
</tr>
<tr>
<td style="background-color:#F8F16F; width:8px;">&#160;</td>
- <td style="text-align:left;">&#160;One Nation</td>
+ <td class="left">One Nation</td>
<td>1</td>
<td>0</td>
<td>1</td>
@@ -249,7 +255,7 @@ Q9500.</p>
</tr>
<tr>
<td style="background-color:#002F5D; width:8px;">&#160;</td>
- <td style="text-align:left;">&#160;Derryn Hinch's Justice Party</td>
+ <td class="left">Derryn Hinch's Justice Party</td>
<td>1</td>
<td>0</td>
<td>1</td>
@@ -286,3 +292,4 @@ Liberal/National government would definitely have been better off with a normal
{% endblock %}
+
diff --git a/project/templates/thue2a.html b/project/templates/thue2a.html
index 3ce9de9..5675cd7 100644
--- a/project/templates/thue2a.html
+++ b/project/templates/thue2a.html
@@ -95,3 +95,4 @@ available <a href="/cgit/cgit.cgi/esoteric.git/" target="_blank">here</a>.</p>
{% endblock %}
+
generated by cgit (git 2.30.0) at 2024-12-22 19:30:33 +0000