Allow use of baseurl, change logo to an internal url, simple graphic placeholder #13

This commit is contained in:
David Darnes 2018-01-01 20:23:56 +00:00
parent a787982af8
commit 4026a8eded
6 changed files with 13 additions and 11 deletions

View File

@ -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"

View File

@ -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 }}

View File

@ -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 %}

View File

@ -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>

View File

@ -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 %}

1
assets/logo.svg Normal file
View File

@ -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>

After

Width:  |  Height:  |  Size: 714 B