Deprecate the animated_favicon variable

APNG seems to be well supported so it's not needed I guess

config.toml

@@ -3,7 +3,7 @@ base_url = "https://daudix.codeberg.page/duckquill"
 description = "Modern, pretty, and clean theme."
 
 compile_sass = true
-minify_html = true
+minify_html = false
 generate_feed = true
 feed_filename = "atom.xml"
 build_search_index = false
@@ -54,8 +54,6 @@ primary_color_alpha = "rgba(255, 120, 0, 0.2)"
 # Whether to use emoji as a favicon.
 # Replace with an emoji wrapped in quotes.
 emoji_favicon = false
-# Whether the favicon is an animated GIF or not
-animated_favicon = false
 # URL to website's issue tracker
 issues_url = "https://codeberg.org/daudix/duckquill/issues"
 # URL to website's source code
@@ -117,7 +115,7 @@ show_powered_by = true
 # Whether to show link to website source
 show_source = false
 # Custom copyright text
-# copyright = "© Aperture Science Innovators, 1972"
+# copyright = "© *Aperture* **Science** ~~Innovators~~, `1972`"
 
 # Based on https://carlschwan.eu/2020/12/29/adding-comments-to-your-static-blog-with-mastodon/
 #

content/_index.md

@@ -119,6 +119,10 @@ primary_color = "COLOR_CODE"
 primary_color_alpha = "COLOR_CODE"
 ```
 
+### Favicon
+
+Files named `favicon.png` and `apple-touch-icon.png` are used as favicon and apple touch icon respectively. For animated favicon you can use APNG with `png` file extension.
+
 ## Test Pages
 
 - [Demo page](@/demo/index.md)

content/blog/the-quill-of-duck/index.md

@@ -3,6 +3,7 @@ authors = ["Duck Quack"]
 title = "The Quill of Duck"
 description = "This is a Duckquill post example, this post has nothing but a bunch of text and random formatting, acting like a demo."
 date = 2023-08-31
+updated = "2024-06-21"
 [taxonomies]
 tags = ["Demo", "Test"]
 [extra]

i18n/ar.toml

@@ -46,5 +46,6 @@ table_of_contents = "جدول المحتويات"
 tags = "العلامات"
 tags_title = "العلامات"
 trigger_warning = "تحذير الزناد"
+updated = "آخر تحديث في"
 view_comment = "عرض التعليق على"
 view_profile = "عرض الملف الشخصي على"

i18n/en.toml

@@ -50,5 +50,6 @@ one_tags = "$NUMBER tag in total"
 many_tags = "$NUMBER tags in total"
 tags_title = "Tags"
 trigger_warning = "Trigger Warning"
+updated = "Last updated on"
 view_comment = "View comment at"
 view_profile = "View profile at"

i18n/ru.toml

@@ -56,5 +56,6 @@ few_tags = "Всего $NUMBER тега"
 many_tags = "Всего $NUMBER тегов"
 tags_title = "Теги"
 trigger_warning = "Предупреждение о Тревоге"
+updated = "Последний раз обновлено"
 view_comment = "Показать комментарий на"
 view_profile = "Показать профиль на"

templates/anchor-link.html

@@ -1,8 +1 @@
-{% import "macros/translate.html" as macros_translate %}
-
-{% set language_strings = load_data(path="i18n/" ~ lang ~ '.toml', required=false) %}
-{% if not language_strings %}
-    {% set language_strings = load_data(path="themes/tabi/i18n/" ~ lang ~ ".toml", required=false) %}
-{% endif %}
-
 <a class="zola-anchor" href="#{{ id }}" aria-label="Anchor link for: {{ id }}"><i class="icon"></i></a>

templates/article.html

@@ -1,36 +1,50 @@
 {% extends "base.html" %}
 
 {% block content %}
-{% set date_format = macros_translate::translate(key="date_format", default="%d %B %Y", language_strings=language_strings) %}
+{%- set date_format = macros_translate::translate(key="date_format", default="%d %B %Y", language_strings=language_strings) -%}
-{% set date_locale = macros_translate::translate(key="date_locale", default="en_IE", language_strings=language_strings) %}
+{%- set date_locale = macros_translate::translate(key="date_locale", default="en_IE", language_strings=language_strings) -%}
 <article>
 	<h1>{{ page.title }}</h1>
 
-	{%- if page.date %}
+	{%- if page.date -%}
 		<small>
 			<time datetime="{{ page.date | date(format=' %+') }}" pubdate>
-				{{- page.date | date(format=date_format, locale=date_locale) -}}
+				{{ page.date | date(format=date_format, locale=date_locale) }}
 			</time>
-			{%- if page.authors %}
+			{%- if page.updated -%}
 				<span>•</span>
-				<span>{{ macros_translate::translate(key="author", default="Author", language_strings=language_strings) }}: {{ page.authors[0] }}</span>
+				<time datetime="{{ page.updated | date(format=' %+') }}" pubdate>
-			{%- endif %}
+					<span>
-			{%- if page.taxonomies %}
+						{{ macros_translate::translate(key="updated", default="Last updated on", language_strings=language_strings) }}
-				{%- for name, taxon in page.taxonomies %}
+						{{ page.updated | date(format=date_format, locale=date_locale) }}
+					</span>
+				</time>
+			{%- endif -%}
+			{%- if page.authors -%}
+				<span>•</span>
+				<span>
+					{{ macros_translate::translate(key="author", default="Author", language_strings=language_strings) }}:
+					{{ page.authors[0] }}
+				</span>
+			{%- endif -%}
+			{%- if page.taxonomies -%}
+				{%- for name, taxon in page.taxonomies -%}
 					<span>•</span>
 					<ul class="tags">
-						{%-for item in taxon %}
+						{%- for item in taxon -%}
 							<li>
-								<a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a>
+								<a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">
+									{{ item }}
+								</a>
 							</li>
-						{%- endfor %}
+						{%- endfor -%}
 					</ul>
-				{%- endfor %}
+				{%- endfor -%}
-			{%- endif %}
+			{%- endif -%}
 		</small>
-	{%- endif %}
+	{%- endif -%}
 
-	{% if page.extra.archive %}
+	{%- if page.extra.archive -%}
 		<div class="statement-container archive">
 			<strong class="big">
 				<i class="icon"></i>
@@ -38,9 +52,9 @@
 			</strong>
 			{{ page.extra.archive | markdown | safe }}
 		</div>
-	{% endif %}
+	{%- endif -%}
 
-	{% if page.extra.trigger %}
+	{%- if page.extra.trigger -%}
 		<div class="statement-container trigger">
 			<strong class="big">
 				<i class="icon"></i>
@@ -48,9 +62,9 @@
 			</strong>
 			{{ page.extra.trigger | markdown | safe }}
 		</div>
-	{% endif %}
+	{%- endif -%}
 
-	{% if page.extra.disclaimer %}
+	{%- if page.extra.disclaimer -%}
 		<div class="statement-container disclaimer">
 			<strong class="big">
 				<i class="icon"></i>
@@ -58,59 +72,59 @@
 			</strong>
 			{{ page.extra.disclaimer | markdown | safe }}
 		</div>
-	{% endif %}
+	{%- endif -%}
 
-	{% if page.extra.toc %}
+	{%- if page.extra.toc -%}
 		<h2>{{ macros_translate::translate(key="table_of_contents", default="Table of Contents", language_strings=language_strings) }}</h2>
 		<ul>
-			{% for h1 in page.toc %}
+			{%- for h1 in page.toc -%}
 				<li>
 					<a href="{{ h1.permalink | safe }}">{{ h1.title }}</a>
-					{% if h1.children %}
+					{%- if h1.children -%}
 						<ul>
-							{% for h2 in h1.children %}
+							{%- for h2 in h1.children -%}
 								<li>
 									<a href="{{ h2.permalink | safe }}">{{ h2.title }}</a>
 								</li>
-							{% endfor %}
+							{%- endfor -%}
 						</ul>
-					{% endif %}
+					{%- endif -%}
 				</li>
-			{% endfor %}
+			{%- endfor -%}
 		</ul>
-	{% endif %}
+	{%- endif -%}
 
 	{{ page.content | safe }}
 </article>
 
-{% if page.extra.comments.id %}
+{%- if page.extra.comments.id -%}
 	{% include "partials/comments.html" ignore missing %}
-{% endif %}
+{%- endif -%}
 
-{% if page.lower or page.higher %}
+{%- if page.lower or page.higher -%}
 	<hr>
 	<nav id="post-nav">
-		{% if page.higher %}
+		{%- if page.higher -%}
 			<a class="post-nav-item post-nav-prev" href="{{ page.higher.permalink }}">
 				<div class="nav-arrow">{{ macros_translate::translate(key="previous", default="Previous", language_strings=language_strings) }}</div>
 				<span class="post-title">{{ page.higher.title }}</span>
 			</a>
-		{% endif %}
+		{%- endif -%}
-		{% if page.lower %}
+		{%- if page.lower -%}
 			<a class="post-nav-item post-nav-next" href="{{ page.lower.permalink }}">
 				<div class="nav-arrow">{{ macros_translate::translate(key="next", default="Next", language_strings=language_strings) }}</div>
 				<span class="post-title">{{ page.lower.title }}</span>
 			</a>
-		{% endif %}
+		{%- endif -%}
 	</nav>
-{% endif %}
+{%- endif -%}
 
 <div class="dialog-buttons">
 	<a class="inline-button" href="#top">{{ macros_translate::translate(key="go_to_top", default="Go to Top", language_strings=language_strings) }}</a>
-	{% if config.extra.issues_url %}
+	{%- if config.extra.issues_url -%}
 		<a class="inline-button colored external" href="{{ config.extra.issues_url }}">
 			{{ macros_translate::translate(key="file_an_issue", default="File an Issue", language_strings=language_strings) }}
 		</a>
-	{% endif %}
+	{%- endif -%}
 </div>
 {% endblock content %}

templates/article_list.html

@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 
 {% block content %}
-{% set date_format = macros_translate::translate(key="date_format", default="%d %B %Y", language_strings=language_strings) %}
+{%- set date_format = macros_translate::translate(key="date_format", default="%d %B %Y", language_strings=language_strings) -%}
-{% set date_locale = macros_translate::translate(key="date_locale", default="en_IE", language_strings=language_strings) %}
+{%- set date_locale = macros_translate::translate(key="date_locale", default="en_IE", language_strings=language_strings) -%}
 <h1>{{ section.title }}</h1>
 
 {{ section.description | markdown | safe }}
@@ -16,47 +16,47 @@
 </small>
 
 <div id="article-list">
-	{% for page in section.pages %}
+	{%- for page in section.pages -%}
 		<article {% if page.draft %}class="draft"{% endif %}>
 			<h3><a href="{{ page.permalink | safe }}">{{ page.title }}</a></h3>
-			{%- if page.draft %}
+			{%- if page.draft -%}
 				<span class="draft-badge">
 					<i class="icon"></i>
 					{{ macros_translate::translate(key="drafted", default="Drafted", language_strings=language_strings) }}
 				</span>
-			{%- endif %}
+			{%- endif -%}
-			{%- if page.extra.archive %}
+			{%- if page.extra.archive -%}
 				<span class="archive-badge">
 					<i class="icon"></i>
 					{{ macros_translate::translate(key="archived", default="Archived", language_strings=language_strings) }}
 				</span>
-			{%- endif %}
+			{%- endif -%}
-			{%- if page.description %}
+			{%- if page.description -%}
 				{{ page.description | markdown | safe }}
-			{%- endif %}
+			{%- endif -%}
-			{%- if page.date %}
+			{%- if page.date -%}
 				<small>
 					<time datetime="{{ page.date | date(format='%+') }}" pubdate>
 						{{- page.date | date(format=date_format, locale=date_locale) -}}
 					</time>
-					{%- if page.authors %}
+					{%- if page.authors -%}
 						<span>•</span>
 						<span>{{ macros_translate::translate(key="author", default="Author", language_strings=language_strings) }}: {{ page.authors[0] }}</span>
 					{%- endif %}
-					{%- if page.taxonomies %}
+					{%- if page.taxonomies -%}
-						{%- for name, taxon in page.taxonomies %}
+						{%- for name, taxon in page.taxonomies -%}
 							<span>•</span>
 							<ul class="tags">
-								{%-for item in taxon %}
+								{%-for item in taxon -%}
 									<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
-								{%- endfor %}
+								{%- endfor -%}
 							</ul>
-						{%- endfor %}
+						{%- endfor -%}
-					{%- endif %}
+					{%- endif -%}
 				</small>
-			{%- endif %}
+			{%- endif -%}
 		</article>
 		<hr>
-	{% endfor %}
+	{%- endfor -%}
 </div>
 {% endblock content %}

templates/base.html

@@ -1,10 +1,10 @@
 {% import "macros/translate.html" as macros_translate %}
 
-{% set language_strings = load_data(path="i18n/" ~ lang ~ '.toml', required=false) %}
+{%- set language_strings = load_data(path="i18n/" ~ lang ~ '.toml', required=false) -%}
-{% if not language_strings %}
+{%- if not language_strings -%}
-    {% set language_strings = load_data(path="themes/tabi/i18n/" ~ lang ~ ".toml", required=false) %}
+    {%- set language_strings = load_data(path="themes/tabi/i18n/" ~ lang ~ ".toml", required=false) -%}
-{% endif %}
+{%- endif -%}
-{% set rtl_languages = ["ar", "arc", "az", "dv", "ff", "he", "ku", "nqo", "fa", "rhg", "syc", "ur"] %}
+{%- set rtl_languages = ["ar", "arc", "az", "dv", "ff", "he", "ku", "nqo", "fa", "rhg", "syc", "ur"] -%}
 
 <!DOCTYPE html>
 <html {% if lang in rtl_languages %}dir="rtl"{% endif %} lang="{{ lang }}">
@@ -12,10 +12,12 @@
 {% include "partials/head.html" %}
 
 <body>
-	{% include "partials/nav.html" %}
+	{%- if config.extra.nav.links %}
+		{% include "partials/nav.html" %}
+	{%- endif %}
 	<div id="main" class="container">
-		{% block custom %}{%- endblock -%}
+		{% block custom %}{% endblock %}
-		{% block content %}{%- endblock -%}
+		{% block content %}{% endblock %}
 	</div>
 	{% include "partials/footer.html" %}
 </body>

templates/page.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-{% if page.extra.archive %}
+{%- if page.extra.archive -%}
 	<div class="statement-container archive">
 		<strong class="big">
 			<i class="icon"></i>
@@ -9,6 +9,6 @@
 		</strong>
 		{{ page.extra.archive | markdown | safe }}
 	</div>
-{% endif %}
+{%- endif -%}
 {{ page.content | safe }}
 {% endblock content %}

templates/partials/comments.html

@@ -1,32 +1,26 @@
-<!-- Taken from the https://carlschwan.eu/2020/12/29/adding-comments-to-your-static-blog-with-mastodon/ -->
+{#- Taken from the https://carlschwan.eu/2020/12/29/adding-comments-to-your-static-blog-with-mastodon/ -#}
 
-{% if page.extra.comments.host %}
+{%- if page.extra.comments.host -%}
-	{% set host = page.extra.comments.host %}
+	{%- set host = page.extra.comments.host -%}
-{% else %}
+{%- else -%}
-	{% set host = config.extra.comments.host %}
+	{%- set host = config.extra.comments.host -%}
-{% endif %}
+{%- endif -%}
 
-{% if page.extra.comments.user %}
+{%- if page.extra.comments.user -%}
-	{% set username = page.extra.comments.user %}
+	{%- set username = page.extra.comments.user -%}
-{% else %}
+{%- else %}
-	{% set username = config.extra.comments.user %}
+	{%- set username = config.extra.comments.user -%}
-{% endif %}
+{%- endif -%}
 
-{% set id = page.extra.comments.id %}
+{%- set id = page.extra.comments.id -%}
-{% set date_locale = macros_translate::translate(key="date_locale", default="en-IE", language_strings=language_strings) | replace(from="_", to="-") %}
+{%- set date_locale = macros_translate::translate(key="date_locale", default="en-IE", language_strings=language_strings) | replace(from="_", to="-") -%}
 
 <section id="comments">
-	{% if config.extra.comments.show_qr %}
+	{%- if config.extra.comments.show_qr -%}
 		<img id="qrcode" class="no-hover pixels" alt="QR code to a Mastodon post" src="https://api.qrserver.com/v1/create-qr-code/?data=https://{{ host }}/@{{ username }}/{{ id }}&format=gif" />
-	{% endif %}
+	{%- endif -%}
-
+	<h2>{{ macros_translate::translate(key="comments", default="Comments", language_strings=language_strings) }}</h2>
-	<h2>
+	<p>{{ macros_translate::translate(key="comments_description", default="You can comment on this blog post by publicly replying to this post using a Mastodon or other ActivityPub/Fediverse account. Known non-private replies are displayed below.", language_strings=language_strings) }}</p>
-		{{ macros_translate::translate(key="comments", default="Comments", language_strings=language_strings) }}
-	</h2>
-	<p>
-		{{ macros_translate::translate(key="comments_description", default="You can comment on this blog post by publicly replying to this post using a Mastodon or other ActivityPub/Fediverse account. Known non-private replies are displayed below.", language_strings=language_strings) }}
-	</p>
-
 	<div class="dialog-buttons">
 		<a id="load-comments" class="inline-button" onclick="loadComments()" onkeypress="loadComments()" tabindex="0">
 			{{ macros_translate::translate(key="load_comments", default="Load Comments", language_strings=language_strings) }}
@@ -35,12 +29,9 @@
 			{{ macros_translate::translate(key="open_post", default="Open Post", language_strings=language_strings) }}
 		</a>
 	</div>
-
 	<div id="comments-wrapper">
 		<noscript>
-			<p>
+			<p>{{ macros_translate::translate(key="comments_noscript", default="Loading comments relies on JavaScript. Try enabling JavaScript and reloading, or visit the original post on Mastodon.", language_strings=language_strings) }}</p>
-				{{ macros_translate::translate(key="comments_noscript", default="Loading comments relies on JavaScript. Try enabling JavaScript and reloading, or visit the original post on Mastodon.", language_strings=language_strings) }}
-			</p>
 		</noscript>
 	</div>
 	<script type="text/javascript">

templates/partials/copy_button.html

@@ -1,5 +1,6 @@
+{#- Based on https://www.roboleary.net/2022/01/13/copy-code-to-clipboard-blog.html -#}
+
 <script>
-	// Based on https://www.roboleary.net/2022/01/13/copy-code-to-clipboard-blog.html
 	document.addEventListener("DOMContentLoaded", function () {
 		let blocks = document.querySelectorAll("pre[class^='language-']");
 

templates/partials/footer.html

@@ -1,68 +1,60 @@
 <footer id="site-footer">
-	{% if config.extra.footer.links %}
+	{%- if config.extra.footer.links -%}
 		<nav>
 			<ul>
-				{% for link in config.extra.footer.links %}
+				{%- for link in config.extra.footer.links -%}
-				{%- if link.url is matching('https?://') %}
+				{%- if link.url is matching('https?://') -%}
 					<li>
-						<a href="{{ link.url }}"
+						<a href="{{ link.url }}">
-							{% if current_url | default(value='/') | trim_end_matches(pat='/') | safe == link.url | trim_end_matches(pat='/') | safe %}
-								class="active"
-							{% endif %}>
 							{{ macros_translate::translate(key=link.name, default=link.name, language_strings=language_strings) }}
 						</a>
 					</li>
-				{%- else %}
+				{%- else -%}
 					<li>
-						<a href="{{ get_url(path=link.url, lang=lang)}}"
+						<a href="{{ get_url(path=link.url, lang=lang)}}">
-							{% if current_url | default(value='/') | trim_end_matches(pat='/') | safe == get_url(path=link.url, lang=lang) | trim_end_matches(pat='/') | safe %}
-								class="active"
-							{% endif %}>
 							{{ macros_translate::translate(key=link.name, default=link.name, language_strings=language_strings) }}
 						</a>
 					</li>
-				{%- endif %}
+				{%- endif -%}
-			{% endfor %}
+			{%- endfor -%}
 			</ul>
 		</nav>
-	{% endif %}
+	{%- endif -%}
 
-	{% if config.extra.footer.show_copyright %}
+	{%- if config.extra.footer.show_copyright -%}
-		<p title="Last built at {{ now() | date(format='%F %a %R') }}">
+		{%- if config.extra.footer.copyright -%}
-			{% if config.extra.footer.copyright %}
+			{{ config.extra.footer.copyright | markdown | safe }}
-				{{ config.extra.footer.copyright }}
+		{%- else -%}
-			{% else %}
+			<p>&copy; {{ config.title }}, {{ now() | date(format="%Y") }}</p>
-				&copy; {{ config.title }}, {{ now() | date(format="%Y") }}
+		{%- endif -%}
-			{% endif %}
+	{%- endif -%}
-		</p>
-	{% endif %}
 
-	{% if config.extra.source_url and config.extra.footer.show_source %}
+	{%- if config.extra.source_url and config.extra.footer.show_source -%}
 		<p>
 			<a href="{{ config.extra.source_url }}">
 				{{ macros_translate::translate(key="source", default="Website source", language_strings=language_strings) }}
 			</a>
 		</p>
-	{% endif %}
+	{%- endif -%}
 
-	{% if config.extra.footer.show_powered_by %}
+	{%- if config.extra.footer.show_powered_by -%}
 		<p>
 			<small>
 				{{ macros_translate::translate(key="powered_by", default="Powered by", language_strings=language_strings) }} <a class="link" href="https://www.getzola.org">Zola</a> {{ macros_translate::translate(key="powered_by_and", default="and", language_strings=language_strings) }} <a class="link" href="https://daudix.codeberg.page/duckquill">Duckquill</a>
 			</small>
 		</p>
-	{% endif %}
+	{%- endif -%}
 
-	{% if config.extra.footer.socials %}
+	{%- if config.extra.footer.socials -%}
 		<ul id="socials">
-			{% for link in config.extra.footer.socials %}
+			{%- for link in config.extra.footer.socials -%}
 				<li>
 					<a href="{{ link.url | safe }}" rel="me" title="{{ link.name }}">
 						<i class="icon" style='mask-image: url("data:image/svg+xml,{{ link.icon }}"); -webkit-mask-image: url("data:image/svg+xml,{{ link.icon }}")'></i>
 						<span>{{ link.name }}</span>
 					</a>
 				</li>
-			{% endfor %}
+			{%- endfor -%}
 		</ul>
-	{% endif %}
+	{%- endif -%}
 </footer>

templates/partials/head.html

@@ -8,76 +8,74 @@
 	<link rel="canonical" href="{{ current_url | default(value='/') | safe }}" />
 	<title>{% include "partials/title.html" %}</title>
 
-	{% if config.markdown.highlight_code and config.markdown.highlight_theme == "css" %}
+	{%- if config.markdown.highlight_code and config.markdown.highlight_theme == "css" %}
-		{% if config.markdown.highlight_themes_css | length > 0 %}
+		{%- if config.markdown.highlight_themes_css | length > 0 %}
 			<link rel="stylesheet" href="{{ get_url(path='syntax-theme-light.css') }}" media="(prefers-color-scheme: light)" />
 			<link rel="stylesheet" href="{{ get_url(path='syntax-theme-dark.css') }}" media="(prefers-color-scheme: dark)" />
-		{% else %}
+		{%- else %}
 			<link rel="stylesheet" href="{{ get_url(path='syntax-theme.css') }}" />
-		{% endif %}
+		{%- endif %}
-	{% endif %}
+	{%- endif %}
 
-    {% set stylesheets = [ "style.css" ] %}
+    {%- set stylesheets = [ "style.css" ] %}
 
-    {% if config.extra.stylesheets -%}
+    {%- if config.extra.stylesheets %}
-        {% set stylesheets = stylesheets | concat(with=config.extra.stylesheets) %}
+        {%- set stylesheets = stylesheets | concat(with=config.extra.stylesheets) %}
-    {% endif %}
+    {%- endif %}
 
-    {% if page.extra.stylesheets %}
+    {%- if page.extra.stylesheets -%}
-        {% set stylesheets = stylesheets | concat(with=page.extra.stylesheets) %}
+        {%- set stylesheets = stylesheets | concat(with=page.extra.stylesheets) %}
-	{% elif section.extra.stylesheets %}
+	{%- elif section.extra.stylesheets %}
-        {% set stylesheets = stylesheets | concat(with=section.extra.stylesheets) %}
+        {%- set stylesheets = stylesheets | concat(with=section.extra.stylesheets) %}
-    {% endif %}
+    {%- endif %}
 
-    {% for stylesheet in stylesheets %}
+    {%- for stylesheet in stylesheets %}
-        <link rel="stylesheet" href="{{ get_url(path=stylesheet) | safe }}" />
+		<link rel="stylesheet" href="{{ get_url(path=stylesheet) | safe }}" />
-    {% endfor %}
+    {%- endfor %}
 
-	<style type="text/css">
+	<style type="text/css">:root {--primary-color: {{ config.extra.primary_color }}; --primary-color-alpha: {{ config.extra.primary_color_alpha }};}</style>
-		:root {
-			--primary-color: {{ config.extra.primary_color }};
-			--primary-color-alpha: {{ config.extra.primary_color_alpha }};
-		}
-	</style>
 
-	{% if config.extra.goatcounter %}
+	{%- if config.extra.goatcounter %}
 		<script data-goatcounter="https://{{ config.extra.goatcounter.user }}.{{ config.extra.goatcounter.host | default(value='goatcounter.com') }}/count" async src="//gc.zgo.at/count.js"></script>
 		<noscript>
 			<img src="https://{{ config.extra.goatcounter.user }}.{{ config.extra.goatcounter.host | default(value='goatcounter.com') }}/count?p={{ current_path | default(value='/') | safe }}" />
 		</noscript>
-	{% endif %}
+	{%- endif %}
 
-	{% if config.extra.show_copy_button %}
+	{%- if config.extra.show_copy_button %}
-		{% include "partials/copy-button.html" %}
+    	{%- set scripts = [ "copy-button.js" ] %}
-	{% endif %}
+	{%- endif %}
 
-	{% if config.extra.scripts %}
+    {%- if config.extra.scripts %}
-		{% for script in config.extra.scripts %}
+        {%- set scripts = scripts | concat(with=config.extra.scripts) %}
-			<script src="{{ get_url(path=script) }}"></script>
+    {%- endif %}
-		{% endfor %}
-	{% endif %}
 
-	{% if config.extra.comments %}
+    {%- if page.extra.scripts %}
+        {%- set scripts = scripts | concat(with=page.extra.scripts) %}
+	{%- elif section.extra.scripts %}
+        {%- set scripts = scripts | concat(with=section.extra.scripts) %}
+    {%- endif %}
+
+    {%- for script in scripts %}
+		<script src="{{ get_url(path=script) | safe }}"></script>
+    {%- endfor %}
+
+	{%- if config.extra.comments %}
 		<link rel="me" href="https://{{ config.extra.comments.host }}/@{{ config.extra.comments.user }}" />
-	{% endif %}
+	{%- endif %}
 
-	{% if config.extra.emoji_favicon %}
+	{%- if config.extra.emoji_favicon %}
 		<link rel="icon" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'%3E%3Ctext x='-.07em' y='.89em' font-size='90'%3E{{ config.extra.emoji_favicon }}%3C/text%3E%3C/svg%3E">
-	{% elif config.extra.animated_favicon %}
+	{%- else %}
-		<link rel="icon" type="image/gif" href="{{ get_url(path='favicon.gif') }}" />
-	{% else %}
 		<link rel="icon" type="image/png" href="{{ get_url(path='favicon.png') }}" />
-	{% endif %}
+	{%- endif %}
 
 	<link rel="apple-touch-icon" type="image/png" sizes="180x180" href="{{ get_url(path='apple-touch-icon.png') }}" />
 
-	{% if config.generate_feed %}
+	{%- if config.generate_feed %}
-		{% block feed -%}
+		<link rel="alternate" type={% if config.feed_filename == "atom.xml" %}"application/atom+xml"{% else %}"application/rss+xml"{% endif %} title="{{ config.title }}" href="{{ get_url(path=config.feed_filename) | safe }}" />
-			<link rel="alternate" type={% if config.feed_filename == "atom.xml" %}"application/atom+xml"{% else %}"application/rss+xml"{% endif %} title="{{ config.title }}" href="{{ get_url(path=config.feed_filename) | safe }}" />
+	{%- endif %}
-		{% endblock -%}
-	{% endif %}
 
-	<!-- Open Graph -->
 	<meta property="og:site_name" content="{{ config.title }}" />
 	<meta property="og:title" content="{% include 'partials/title.html' %}" />
 	<meta property="og:url" content="{{ current_url | default(value='/') | safe }}" />

templates/partials/language_switcher.html

@@ -2,9 +2,7 @@
     <details>
         <summary>
             <i class="icon"></i>
-            <span class="hidden">
+            <span class="hidden">{{ macros_translate::translate(key="language", default="Language", language_strings=language_strings) }}</span>
-                {{ macros_translate::translate(key="language", default="Language", language_strings=language_strings) }}
-            </span>
         </summary>
         <ul>
             {%- for lcode, ldetails in config.languages -%}

templates/partials/nav.html

@@ -1,4 +1,3 @@
-{% if config.extra.nav.links %}
 <header id="site-nav">
 	<nav>
 		<a href="#main" id="main-content" tabindex="0">
@@ -7,37 +6,37 @@
 		<ul>
 			<li id="home">
 				<a href="{{ get_url(path="/", lang=lang) }}"
-					{% if current_url | default(value="/") | trim_end_matches(pat="/") | safe == get_url(path="/", lang=lang) | trim_end_matches(pat='/') | safe %}
+					{%- if current_url | default(value="/") | trim_end_matches(pat="/") | safe == get_url(path="/", lang=lang) | trim_end_matches(pat='/') | safe -%}
 						class="active"
-					{% endif %}>
+					{%- endif -%}>
 					{{ config.title }}
 				</a>
 			</li>
-			{% for link in config.extra.nav.links %}
+			{%- for link in config.extra.nav.links -%}
-				{%- if link.url is matching('https?://') %}
+				{%- if link.url is matching('https?://') -%}
 					<li>
 						<a href="{{ link.url }}"
-							{% if current_url | default(value='/') | trim_end_matches(pat='/') | safe == link.url | trim_end_matches(pat='/') | safe %}
+							{%- if current_url | default(value='/') | trim_end_matches(pat='/') | safe == link.url | trim_end_matches(pat='/') | safe -%}
 								class="active"
-							{% endif %}>
+							{%- endif -%}>
 							{{ macros_translate::translate(key=link.name, default=link.name, language_strings=language_strings) }}
 						</a>
 					</li>
-				{%- else %}
+				{%- else -%}
 					<li>
 						<a href="{{ get_url(path=link.url, lang=lang)}}"
-							{% if current_url | default(value='/') | trim_end_matches(pat='/') | safe == get_url(path=link.url, lang=lang) | trim_end_matches(pat='/') | safe %}
+							{%- if current_url | default(value='/') | trim_end_matches(pat='/') | safe == get_url(path=link.url, lang=lang) | trim_end_matches(pat='/') | safe -%}
 								class="active"
-							{% endif %}>
+							{%- endif -%}>
 							{{ macros_translate::translate(key=link.name, default=link.name, language_strings=language_strings) }}
 						</a>
 					</li>
-				{%- endif %}
+				{%- endif -%}
-			{% endfor %}
+			{%- endfor -%}
-			{% if config.languages | length > 0 %}
+			{%- if config.languages | length > 0 -%}
-				{% include "partials/language_switcher.html" %}
+				{%- include "partials/language_switcher.html" -%}
-			{% endif %}
+			{%- endif -%}
-			{% if config.generate_feed and config.extra.nav.show_feed %}
+			{%- if config.generate_feed and config.extra.nav.show_feed -%}
 				<li id="feed">
 					<a href="{{ get_url(path=config.feed_filename) }}">
 						<i class="icon"></i>
@@ -46,8 +45,7 @@
 						</span>
 					</a>
 				</li>
-			{% endif %}
+			{%- endif -%}
 		</ul>
 	</nav>
 </header>
-{% endif %}

templates/shortcodes/image.html

@@ -1,4 +1,4 @@
-{% if url_min %}
+{%- if url_min -%}
 	<a href="{{ url }}">
 		<img class="
 			{% if full %}full{% endif %}
@@ -6,16 +6,16 @@
 			{% if transparent %}transparent{% endif %}
 			{% if no_hover %}no-hover{% endif %}
 		"
-		{% if alt %}alt="{{alt}}"{% endif %}
+		{%- if alt -%}alt="{{alt}}"{%- endif -%}
 		src="{{ url_min }}" />
 	</a>
-{% else %}
+{%- else -%}
 	<img class="
 			{% if full %}full{% endif %}
 			{% if pixels %}pixels{% endif %}
 			{% if transparent %}transparent{% endif %}
 			{% if no_hover %}no-hover{% endif %}
 		"
-		{% if alt %}alt="{{alt}}"{% endif %}
+		{%- if alt -%}alt="{{alt}}"{%- endif -%}
 		src="{{ url }}" />
-{% endif %}
+{%- endif -%}

templates/shortcodes/video.html

@@ -3,5 +3,5 @@
 		{% if pixels %}pixels{% endif %}
 		{% if transparent %}transparent{% endif %}
   	"
-	{% if alt %}alt="{{alt}}"{% endif %}
+	{%- if alt -%}alt="{{alt}}"{%- endif -%}
 	controls src="{{url}}"></video>

templates/taxonomy_list.html

@@ -1,14 +1,14 @@
 {% extends "base.html" %}
 
 {% block content %}
-{% set number_of_tags = terms | length %}
+{%- set number_of_tags = terms | length -%}
 <h1>{{ macros_translate::translate(key="tags_title", default="Tags", language_strings=language_strings) }}</h1>
 <small>{{ macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER tags", language_strings=language_strings) }}
 </small>
 <br />
 <ul class="tags">
-	{% for tag in terms %}
+	{%- for tag in terms -%}
 		<li><a href="{{ get_taxonomy_url(kind='tags', name=tag.name, lang=lang) }}"><span class="tag">{{ tag.name }}</span><span class="count">{{ tag.pages | length }}</span></a></li>
-	{% endfor %}
+	{%- endfor -%}
 </ul>
 {% endblock content %}

templates/taxonomy_single.html

@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 
 {% block content %}
-{% set date_format = macros_translate::translate(key="date_format", default="%d %B %Y", language_strings=language_strings) %}
+{%- set date_format = macros_translate::translate(key="date_format", default="%d %B %Y", language_strings=language_strings) -%}
-{% set date_locale = macros_translate::translate(key="date_locale", default="en_IE", language_strings=language_strings) %}
+{%- set date_locale = macros_translate::translate(key="date_locale", default="en_IE", language_strings=language_strings) -%}
-{% set number_of_posts = term.pages | length %}
+{%- set number_of_posts = term.pages | length -%}
 <h1>{{ macros_translate::translate(key="posts_with_tag", default="Posts with tag", language_strings=language_strings) }} “{{ term.name }}”</h1>
 
 <small>
@@ -15,49 +15,49 @@
 </small>
 
 <div id="article-list">
-	{% for page in term.pages %}
+	{%- for page in term.pages -%}
 		<article {% if page.draft %}class="draft"{% endif %}>
 			<h3><a href="{{ page.permalink | safe }}">{{ page.title }}</a></h3>
-			{%- if page.draft %}
+			{%- if page.draft -%}
 				<span class="draft-badge">
 					<i class="icon"></i>
 					{{ macros_translate::translate(key="drafted", default="Drafted", language_strings=language_strings) }}
 				</span>
-			{%- endif %}
+			{%- endif -%}
-			{%- if page.extra.archive %}
+			{%- if page.extra.archive -%}
 				<span class="archive-badge">
 					<i class="icon"></i>
 					{{ macros_translate::translate(key="archived", default="Archived", language_strings=language_strings) }}
 				</span>
-			{%- endif %}
+			{%- endif -%}
 			{%- if page.description %}
 				{{ page.description | markdown | safe }}
-			{%- endif %}
+			{%- endif -%}
-			{%- if page.date %}
+			{%- if page.date -%}
 				<small>
 					<time datetime="{{ page.date | date(format='%+') }}" pubdate>
 						{{- page.date | date(format=date_format, locale=date_locale) -}}
 					</time>
-					{%- if page.authors %}
+					{%- if page.authors -%}
 						<span>•</span>
 						<span>
 							{{ macros_translate::translate(key="author", default="Author", language_strings=language_strings) }}: {{ page.authors[0] }}
 						</span>
-					{%- endif %}
+					{%- endif -%}
-					{%- if page.taxonomies %}
+					{%- if page.taxonomies -%}
-						{%- for name, taxon in page.taxonomies %}
+						{%- for name, taxon in page.taxonomies -%}
 							<span>•</span>
 							<ul class="tags">
-								{%-for item in taxon %}
+								{%-for item in taxon -%}
 									<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
-								{%- endfor %}
+								{%- endfor -%}
 							</ul>
-						{%- endfor %}
+						{%- endfor -%}
-					{%- endif %}
+					{%- endif -%}
 				</small>
-			{%- endif %}
+			{%- endif -%}
 		</article>
 		<hr>
-	{% endfor %}
+	{%- endfor -%}
 </div>
 {% endblock content %}