From 4026a8ededd3fce0f3506693348f04071e160469 Mon Sep 17 00:00:00 2001
From: David Darnes <me@daviddarnes.com>
Date: Mon, 1 Jan 2018 20:23:56 +0000
Subject: [PATCH] Allow use of baseurl, change logo to an internal url, simple
 graphic placeholder #13

---
 _config.yml                    | 7 ++++---
 _includes/post-list.html       | 4 ++--
 _includes/post-pagination.html | 4 ++--
 _includes/site-logo.html       | 4 ++--
 _includes/site-nav.html        | 4 ++--
 assets/logo.svg                | 1 +
 6 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 assets/logo.svg

diff --git a/_config.yml b/_config.yml
index f84dcfc..1b564e6 100755
--- a/_config.yml
+++ b/_config.yml
@@ -37,9 +37,9 @@ timezone: Europe/London # Timezone for blog posts and alike
 # 5. Collections
 collections:
   posts:
-    title: Welcome # Needed for Siteleaf
+    title: Blog # Needed for Siteleaf
     output: true
-    description: "This is just a demo, find out more [about Garth](/about/)" # The post list page content
+    description: "This is just a demo, find out more [about Garth](about)" # The post list page content
 
 # 6. Jekyll collections settings
 defaults:
@@ -59,6 +59,7 @@ defaults:
 # 7. Site settings
 encoding: utf-8 # Make sure the encoding is right
 title: "Garth" # Site name or title
-logo: "https://www.gravatar.com/avatar/6c0377abcf4da91cdd35dea4554b2a4c?s=500" # Site logo
+logo: "/assets/logo.svg" # Site logo
 description: "A stupidly simple theme for Jekyll, using the official Jekyll theme implementation" # Site description and default description
 url: "https://garth.darn.es" # Site url
+baseurl: "/toast"
diff --git a/_includes/post-list.html b/_includes/post-list.html
index 9f4aa50..99b32d0 100755
--- a/_includes/post-list.html
+++ b/_includes/post-list.html
@@ -5,7 +5,7 @@
 			<li class="item  item--post">
 				<article class="article  article--post  typeset">
 
-					<h2><a href="{{ page.url }}">{{ page.title }}</a></h2>
+					<h2><a href="{{ site.baseurl }}{{ page.url }}">{{ page.title }}</a></h2>
 					{% include post-meta.html %}
 					{{ page.excerpt | markdownify | truncatewords: 60 }}
 
@@ -22,7 +22,7 @@
 			<li class="item  item--post">
 				<article class="article  article--post  typeset">
 
-					<h2><a href="{{ page.url }}">{{ page.title }}</a></h2>
+					<h2><a href="{{ site.baseurl }}{{ page.url }}">{{ page.title }}</a></h2>
 					{% include post-meta.html %}
 					{{ page.excerpt | markdownify | truncatewords: 60 }}
 
diff --git a/_includes/post-pagination.html b/_includes/post-pagination.html
index 7aee453..19ff05d 100755
--- a/_includes/post-pagination.html
+++ b/_includes/post-pagination.html
@@ -1,7 +1,7 @@
 <nav class="nav  nav--paginator">
 
   {% if paginator.previous_page %}
-    <a href="{{ paginator.previous_page_path }}" class="pagination  pagination--previous">&larr; Previous</a>
+    <a href="{{ site.baseurl }}{{ paginator.previous_page_path }}" class="pagination  pagination--previous">&larr; Previous</a>
   {% else %}
     <span class="pagination  pagination--previous">&larr; Previous</span>
   {% endif %}
@@ -9,7 +9,7 @@
   <span class="pagination  pagination--counter">Page: {{ paginator.page }} of {{ paginator.total_pages }}</span>
 
   {% if paginator.next_page %}
-    <a href="{{ paginator.next_page_path }}" class="pagination  pagination--next">Next &rarr;</a>
+    <a href="{{ site.baseurl }}{{ paginator.next_page_path }}" class="pagination  pagination--next">Next &rarr;</a>
   {% else %}
     <span class="pagination  pagination--next">Next &rarr;</span>
   {% endif %}
diff --git a/_includes/site-logo.html b/_includes/site-logo.html
index ce5d3f0..16e4883 100755
--- a/_includes/site-logo.html
+++ b/_includes/site-logo.html
@@ -1,3 +1,3 @@
-<a class="logo" href="{{ site.url }}">
-  <img src="{{ site.logo }}" alt="{{ site.title }} logo"/>
+<a class="logo" href="{{ site.baseurl }}/">
+  <img src="{{ site.baseurl }}{{ site.logo }}" alt="{{ site.title }} logo"/>
 </a>
diff --git a/_includes/site-nav.html b/_includes/site-nav.html
index c6f6ecb..f2d69a3 100755
--- a/_includes/site-nav.html
+++ b/_includes/site-nav.html
@@ -5,9 +5,9 @@
         <li class="item  item--nav{% if item.url == page.url %}  item--current{% endif %}">
           {% if item.collectionpage %}
       			{% assign collectiondata = site.collections | where: "label", item.collectionpage | first %}
-      			<a href="{{ item.url }}">{{ collectiondata.title }}</a>
+      			<a href="{{ site.baseurl }}{{ item.url }}">{{ collectiondata.title }}</a>
       		{% else %}
-            <a href="{{ item.url }}">{{ item.title }}</a>
+            <a href="{{ site.baseurl }}{{ item.url }}">{{ item.title }}</a>
       		{% endif %}
         </li>
       {% endunless %}
diff --git a/assets/logo.svg b/assets/logo.svg
new file mode 100644
index 0000000..062bf81
--- /dev/null
+++ b/assets/logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 42 42"><g fill="none" fill-rule="evenodd"><path fill="#8549FC" fill-rule="nonzero" d="M11 16.21V26c.4.31 1.1.64 1.99.93A27.1 27.1 0 0 0 21 28c3.08 0 5.95-.4 8.01-1.07A7.1 7.1 0 0 0 31 26v-9.79C28.85 17.3 25.17 18 21 18s-7.85-.71-10-1.79zM33 14v12c0 2.2-5.37 4-12 4S9 28.2 9 26V14c0-2.2 5.37-4 12-4s12 1.8 12 4zm-3.99-.93A27.1 27.1 0 0 0 21 12c-3.08 0-5.95.4-8.01 1.07-.9.3-1.58.62-1.99.93.4.31 1.1.64 1.99.93A27.1 27.1 0 0 0 21 16c3.08 0 5.95-.4 8.01-1.07A7.1 7.1 0 0 0 31 14a7.1 7.1 0 0 0-1.99-.93zM15 24.5a1 1 0 0 1-2 0v-5a1 1 0 0 1 2 0v5zm7 1a1 1 0 0 1-2 0v-5a1 1 0 0 1 2 0v5zm7-1a1 1 0 0 1-2 0v-5a1 1 0 0 1 2 0v5z"/><rect width="42" height="42"/></g></svg>