Extract footer, update links

4 files changed, 15 insertions, 22 deletions

diff --git a/footer.html b/footer.html
new file mode 100644
index 0000000..1277c5e
--- /dev/null
+++ b/footer.html
@@ -0,0 +1,9 @@
+<footer>
+	<p>
+		Copyright &copy; Johannes Löthberg 2014<br />
+		PGP Key ID: 0x3A9D0BB5
+	</p>
+	<a id="emblem" href='http://www.catb.org/hacker-emblem/'>
+		<img src='/~kyrias/glider.png' alt='hacker emblem' />
+	</a>
+</footer>
diff --git a/header.html b/header.html
index 370f90b..041b4d5 100644
--- a/header.html
+++ b/header.html
@@ -1,10 +1,10 @@
 <header>
-	<h1><a href="/">Johannes Löthberg</a></h1>
+	<h1><a href="/~kyrias">Johannes Löthberg</a></h1>
 	<nav>
 		<ul>
-			<li><a href="/">~/</a></li>
-			<li><a href="/blog">blog/</a></li>
-			<li><a href="/contact">contact/</a></li>
+			<li><a href="/~kyrias">~/</a></li>
+			<li><a href="/~kyrias/blog">blog/</a></li>
+			<li><a href="/~kyrias/contact.html">contact/</a></li>
 		</ul>
 	</nav>
 </header>
diff --git a/index.html b/index.html
index 51014e8..2d79346 100644
--- a/index.html
+++ b/index.html
@@ -22,13 +22,6 @@
 	</p>
 	</div>
 
-	<div class="contact">
-	<h2>Contact</h2>
-	<p>
-		You can contact me at <a href="mailto:johannes@kyriasis.com">johannes@kyriasis.com</a> or on freenode where I usually use the nick “demize”.
-	</p>
-	</div>
-
 	<div class="blog">
 		<h2>Blog posts</h2>
 		<div class="post-list">
@@ -43,15 +36,6 @@
 		</div>
 	</div>
 
-
-<footer>
-	<p>
-		Copyright &copy; Johannes Löthberg 2014
-	</p>
-	<a id="emblem" href='http://www.catb.org/hacker-emblem/'>
-		<img src='http://www.catb.org/hacker-emblem/glider.png' alt='hacker emblem' />
-	</a>
-</footer>
-
+	<!--# include file="footer.html" -->
 </body>
 </html>
diff --git a/main.css b/main.css
index 1d374ac..35c1d08 100644
--- a/main.css
+++ b/main.css
@@ -13,7 +13,7 @@ body {
 	background-color: #F4F4F4;
 	padding: 0 20px;
 	font-size: 15px;
-	font-family: DejaVu Sans
+	font-family: Sans
 }
 
 a {