Update font and add logo

4 files changed, 32 insertions, 12 deletions

diff --git a/_layouts/post.html b/_layouts/post.html
index 47e12a4..f11a80f 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -1,28 +1,32 @@
 ---
 layout: default
 ---
+<div id="logo">
+  <a href='/list.html'><img src='http://upload.wikimedia.org/wikipedia/commons/thumb/b/b1/EnsoZen.png/50px-EnsoZen.png' alt='' /></a>
+</div>
+
 <h1><a href="{{ page.url }}">{{ page.title }}</a></h1>
 
-{% if page.previous.url %} 
+{% if page.previous.url %}
     <p id="bigleft"><a href="{{page.previous.url}}">&laquo;</a></p><br />
-{% endif %} 
-{% if page.next.url %} 
-    <p id="bigright"><a href="{{page.next.url}}">&raquo;</a></p> 
-{% endif %} 
+{% endif %}
+{% if page.next.url %}
+    <p id="bigright"><a href="{{page.next.url}}">&raquo;</a></p>
+{% endif %}
 
 <div id="entry">
   {{ content }}
 
   <p class="timestamp">
-    {% if page.previous.url %} 
+    {% if page.previous.url %}
       <a href="{{page.previous.url}}">&laquo; {{page.previous.title}}</a> |
     {% endif %}
 
     {{ page.date | date_to_string }}
 
-    {% if page.next.url %} 
-      | <a href="{{page.next.url}}">{{page.next.title}} &raquo;</a> 
-    {% endif %} 
+    {% if page.next.url %}
+      | <a href="{{page.next.url}}">{{page.next.title}} &raquo;</a>
+    {% endif %}
   </p>
 
 </div>
diff --git a/_layouts/static.html b/_layouts/static.html
index 28bbde6..9d4b948 100644
--- a/_layouts/static.html
+++ b/_layouts/static.html
@@ -1,6 +1,10 @@
 ---
 layout: default
 ---
+<div id="logo">
+  <a href='/list.html'><img src='http://upload.wikimedia.org/wikipedia/commons/thumb/b/b1/EnsoZen.png/50px-EnsoZen.png' alt='' /></a>
+</div>
+
 {{ content }}
 
 {% include footer.html %}
diff --git a/static/css/style.css b/static/css/style.css
index 6c31263..4810e0c 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1,5 +1,12 @@
+@font-face {
+  font-family: 'Cabin';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Cabin Regular'), local('Cabin-Regular'), url('/static/fonts/cabin.ttf') format('truetype');
+}
+
 * {
-    font-family: Helvetica, sans-serif;
+    font-family: 'Cabin', "Book Antiqua", "URW Palladio L", sans-serif;
 }
 
 body { 
@@ -12,7 +19,7 @@ div#container {
 }
 
 h1 {
-    margin: 1.5em 0 0 0;
+    margin: 1.5em 0 0 3em;
 }
 
 h1 a {
@@ -49,7 +56,7 @@ blockquote {
 }
 
 #entry, #wrapper {
-    font-size: 13pt;
+    font-size: 15pt;
 }
 
 #entry img {
@@ -62,6 +69,11 @@ img.right {
     margin-left: 1em;
 }
 
+div#logo {
+    margin: -0.2em 0 0 0;
+    float: left;
+}
+
 #entry, #entries, #wrapper, #resume {
     width: 40em;
     margin-left: 5em;
diff --git a/static/fonts/cabin.ttf b/static/fonts/cabin.ttf
new file mode 100644
index 0000000..7c57306
--- /dev/null
+++ b/static/fonts/cabin.ttf