Leilukin
/
leilukin-site
mirror of https://github.com/helenclx/leilukin-site.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unify intentation of Nunjucks if blocks

This commit is contained in:
Helen Chong 2024-10-06 19:23:57 +08:00
parent 6027bdff52
commit a61f8f5e6d
2 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/_includes/global/baselayout.njk
View File

@ -2,9 +2,9 @@
<html lang="{{ sitemeta.siteLanguage }}" dir="ltr" id="top">
<head>
{# Meta data #}
{% block metaTitle %}
{% block metaTitle %}
<meta property="og:title" content="{{ title if title else sitemeta.siteName | safe }}">
{% endblock %}
{% endblock %}
{% include "global/metagen.njk" %}
{# Feeds #}
@ -17,9 +17,9 @@
{# CSS #}
{% include "global/css-bundle.njk" %}
{% if hasTooltips %}
{% if hasTooltips %}
<link rel="stylesheet" href="/assets/css/tooltips.css">
{% endif %}
{% endif %}
<style>{% getBundle "css" %}</style>
{# Favicon #}
@ -33,9 +33,9 @@
{# JavaScript #}
<script src="{% getBundleFileUrl 'js' %}" defer></script>
{% if toc %}
{% if toc %}
<script src="{{'/assets/js/details-utils.js'}}" defer></script>
{% endif %}
{% endif %}
<title>
{% block pageTitle %}{{ title + " | " if title }}{{ sitemeta.siteName | safe }}{% endblock %}
@ -50,15 +50,15 @@
</main>
{% block footer %}{% include "global/footer.njk" %}{% endblock %}
{% if hasTooltips %}
<script src="/assets/js/tooltips.js"></script>
<script>
var selector = '[data-tooltip]';
var els = document.querySelectorAll(selector);
<script src="/assets/js/tooltips.js"></script>
<script>
var selector = '[data-tooltip]';
var els = document.querySelectorAll(selector);
for ( var i = 0; i < els.length; i++ ) {
var dm = new ARIAtip( els[i] );
}
</script>
for ( var i = 0; i < els.length; i++ ) {
var dm = new ARIAtip( els[i] );
}
</script>
{% endif %}
</body>
</html>

100
src/_includes/global/content.njk
View File

@ -1,48 +1,48 @@
<header class="main__header">
{% if isArticle or hasBreadcrumbs %}
<nav aria-labelledby="breadcrumbs-title">
<h2 class="visually-hidden" id="breadcrumbs-title">Breadcrumbs</h2>
<ol class="breadcrumbs">
{% set breadcrumbNavPages = collections.all | eleventyNavigationBreadcrumb(eleventyNavigation.key or articleTitle or pageTitle or title) %}
{%- for entry in breadcrumbNavPages %}
<li>
<a href="{{ entry.url }}">{{ entry.title }}</a>
</li>
{%- endfor %}
</ol>
</nav>
<nav aria-labelledby="breadcrumbs-title">
<h2 class="visually-hidden" id="breadcrumbs-title">Breadcrumbs</h2>
<ol class="breadcrumbs">
{% set breadcrumbNavPages = collections.all | eleventyNavigationBreadcrumb(eleventyNavigation.key or articleTitle or pageTitle or title) %}
{%- for entry in breadcrumbNavPages %}
<li>
<a href="{{ entry.url }}">{{ entry.title }}</a>
</li>
{%- endfor %}
</ol>
</nav>
{% endif %}
<h1>{{ articleTitle or pageTitle or title }}</h1>
{% if isArticle %}
<div class="article__info">
<p class="article__info--desc">{{ desc }}</p>
<p>
{{ content | wordcount | thousands }} words.
Posted on <time datetime="{{ date }}">{{ date | formatDate }}</time> by {{ sitemeta.siteAuthor.name }}
</p>
<div class="article__info">
<p class="article__info--desc">{{ desc }}</p>
<p>
{{ content | wordcount | thousands }} words.
Posted on <time datetime="{{ date }}">{{ date | formatDate }}</time> by {{ sitemeta.siteAuthor.name }}
</p>
{% if updated %}
<p>Last updated on <time datetime="{{ updated }}">{{ updated | formatDate }}</time></p>
<p>Last updated on <time datetime="{{ updated }}">{{ updated | formatDate }}</time></p>
{% endif %}
{% if categories %}
<p>Categories:
{% for cat in categories %}
<a href="/categories/{{ cat | slugify }}">{{ cat }}</a>{% if not loop.last %}, {% endif %}
{% endfor %}
</p>
<p>Categories:
{% for cat in categories %}
<a href="/categories/{{ cat | slugify }}">{{ cat }}</a>{% if not loop.last %}, {% endif %}
{% endfor %}
</p>
{% endif %}
</div>
</div>
{% else %}
{% if desc %}
<p>{{ desc }}</p>
<p>{{ desc }}</p>
{% endif %}
{% endif %}
</header>
<content-wrapper>
{% if toc %}
{% include "global/toc.njk" %}
{% include "global/toc.njk" %}
{% endif %}
{% set contentEl = "article" if isArticle or articleElement else "div" %}
@ -51,29 +51,29 @@
{{ content | safe }}
{% if tags and tags.includes("posts") %}
<nav class="blog__post--pagination" aria-labelledby="nextprev-title">
<h2 class="visually-hidden" id="nextprev-title">Next and Previous Blog Posts</h2>
{%- if collections.posts %}
{%- set previousPost = collections.posts | getPreviousCollectionItem %}
{%- set nextPost = collections.posts | getNextCollectionItem %}
{%- if nextPost or previousPost %}
<ul class="blog__post--nextprev">
{%- if previousPost %}
<li class="blog__post--prev">
<p>Previous Post:</p>
<a href="{{ previousPost.url }}">{{ previousPost.data.articleTitle }}</a>
</li>
{% endif %}
{%- if nextPost %}
<li class="blog__post--next">
<p>Next Post:</p>
<a href="{{ nextPost.url }}">{{ nextPost.data.articleTitle }}</a>
</li>
{% endif %}
</ul>
{%- endif %}
{%- endif %}
</nav>
<nav class="blog__post--pagination" aria-labelledby="nextprev-title">
{%- if collections.posts %}
<h2 class="visually-hidden" id="nextprev-title">Next and Previous Blog Posts</h2>
{%- set previousPost = collections.posts | getPreviousCollectionItem %}
{%- set nextPost = collections.posts | getNextCollectionItem %}
{%- if nextPost or previousPost %}
<ul class="blog__post--nextprev">
{%- if previousPost %}
<li class="blog__post--prev">
<p>Previous Post:</p>
<a href="{{ previousPost.url }}">{{ previousPost.data.articleTitle }}</a>
</li>
{% endif %}
{%- if nextPost %}
<li class="blog__post--next">
<p>Next Post:</p>
<a href="{{ nextPost.url }}">{{ nextPost.data.articleTitle }}</a>
</li>
{% endif %}
</ul>
{%- endif %}
{%- endif %}
</nav>
{% endif %}
</{{contentEl}}>
@ -83,7 +83,7 @@
or page.url === "/articles/"
or tags and tags.includes("blog pages")
%}
{% include "main/content-nav.njk" %}
{% include "main/content-nav.njk" %}
{% endif %}
{% block shrineInfo %}{% endblock %}