Merge tag '6.0.1'
This commit is contained in:
commit
a6fe22b283
25 changed files with 599 additions and 159 deletions
8
_includes/cloudflare_analytics.html
Normal file
8
_includes/cloudflare_analytics.html
Normal file
|
@ -0,0 +1,8 @@
|
|||
{% if site.cloudflare_analytics %}
|
||||
<!-- Cloudflare Web Analytics -->
|
||||
<script defer
|
||||
src='https://static.cloudflareinsights.com/beacon.min.js'
|
||||
data-cf-beacon='{"token": "{{ site.cloudflare_analytics}}"}'>
|
||||
</script>
|
||||
<!-- End Cloudflare Web Analytics -->
|
||||
{% endif %}
|
7
_includes/commentbox.html
Normal file
7
_includes/commentbox.html
Normal file
|
@ -0,0 +1,7 @@
|
|||
{% if site.commentbox %}
|
||||
|
||||
<div class="commentbox"></div>
|
||||
<script src="https://unpkg.com/commentbox.io/dist/commentBox.min.js"></script>
|
||||
<script>commentBox('{{ site.commentbox }}')</script>
|
||||
|
||||
{% endif %}
|
|
@ -3,4 +3,6 @@
|
|||
{% include fb-comment.html %}
|
||||
{% include staticman-comments.html %}
|
||||
{% include utterances-comment.html %}
|
||||
{% include giscus-comment.html %}
|
||||
{% include commentbox.html %}
|
||||
{% endif %}
|
||||
|
|
|
@ -30,6 +30,12 @@
|
|||
<a href="http://{{- site.matomo.uri -}}/index.php?module=CoreAdminHome&action=optOut" target="_blank" class="text_muted">Do-not-Track</a>
|
||||
{% endif %}
|
||||
{% endif%}
|
||||
|
||||
{% if site.edit_page_button and site.github.repository_url %}
|
||||
•
|
||||
<a title="Edit this page on GitHub" href="{{ site.github.repository_url }}/edit/{{ site.github.source.branch }}/{{ page.path }}" class="text_muted">Edit page</a>
|
||||
{% endif%}
|
||||
|
||||
</p>
|
||||
{% unless site.remove-ads %}<p class="theme-by text-muted">
|
||||
Powered by
|
||||
|
|
16
_includes/giscus-comment.html
Normal file
16
_includes/giscus-comment.html
Normal file
|
@ -0,0 +1,16 @@
|
|||
{% if site.giscus.repository and site.giscus.hostname %}
|
||||
|
||||
<script src="https://{{ site.giscus.hostname }}/client.js"
|
||||
data-repo="{{ site.giscus.repository }}"
|
||||
data-repo-id="{{ site.giscus.repository-id }}"
|
||||
data-category="{{ site.giscus.category }}"
|
||||
data-category-id="{{ site.giscus.category-id }}"
|
||||
data-mapping="{{ site.giscus.mapping }}"
|
||||
data-reactions-enabled="{{ site.giscus.reactions-enabled }}"
|
||||
data-emit-metadata="{{ site.giscus.emit-metadata }}"
|
||||
data-theme="{{ site.giscus.theme }}"
|
||||
crossorigin="anonymous"
|
||||
async>
|
||||
</script>
|
||||
|
||||
{% endif %}
|
|
@ -1,5 +1,17 @@
|
|||
{% if site.google_analytics %}
|
||||
<!-- Google Analytics -->
|
||||
{% unless site.gtag %}
|
||||
<div id="bj-ganalytics-deprecated-msg" style="position: fixed; background: #b90404; bottom: 0; width: 100%; z-index: 10000; color: #f0f0f0; text-align: center;">
|
||||
<div title="Close" onclick="$(this).parent().remove()" style="position: absolute; right: 5px; top: 0; font-size: 1.5em; line-height: 1; cursor: pointer;">×</div>
|
||||
<div style="max-width: 800px; margin: auto; font-size: 1.1em">
|
||||
This website is using outdated Google Analytics
|
||||
<details style="font-size: 0.8em; margin-bottom: 5px;">
|
||||
<summary>More info</summary>
|
||||
As of July 2023, Google's Universal Analytics is going away and being replaced by Google Analytics 4. This website is still using the old Universal Analytics. In order to remove this message, the website owner must remove the <code>google_analytics</code> property in the website's config file, and optionally replace it with the new <code>gtag</code> property.
|
||||
</details>
|
||||
</div>
|
||||
</div>
|
||||
{% endunless %}
|
||||
<script>
|
||||
(function (i, s, o, g, r, a, m) {
|
||||
i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
|
||||
|
|
|
@ -39,11 +39,14 @@
|
|||
<meta name="keywords" content="{{ site.keywords }}">
|
||||
{% endif %}
|
||||
|
||||
{% if site.rss-description %}
|
||||
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ '/feed.xml' | absolute_url }}">
|
||||
{% endif %}
|
||||
|
||||
{% include gtag.html %}
|
||||
{% include gtm_head.html %}
|
||||
{% include google_analytics.html %}
|
||||
{% include cloudflare_analytics.html %}
|
||||
|
||||
{% if layout.common-ext-css %}
|
||||
{% for css in layout.common-ext-css %}
|
||||
|
|
|
@ -27,13 +27,13 @@
|
|||
<div class="row">
|
||||
<div class="col-xl-8 offset-xl-2 col-lg-10 offset-lg-1">
|
||||
<div class="{{ include.type }}-heading">
|
||||
<h1>{% if page.title %}{{ page.title }}{% else %}<br/>{% endif %}</h1>
|
||||
<h1>{% if page.title %}{{ page.title | strip_html }}{% else %}<br/>{% endif %}</h1>
|
||||
{% if page.subtitle %}
|
||||
{% if include.type == "page" %}
|
||||
<hr class="small">
|
||||
<span class="{{ include.type }}-subheading">{{ page.subtitle }}</span>
|
||||
<span class="{{ include.type }}-subheading">{{ page.subtitle | strip_html }}</span>
|
||||
{% else %}
|
||||
<h2 class="{{ include.type }}-subheading">{{ page.subtitle }}</h2>
|
||||
<h2 class="{{ include.type }}-subheading">{{ page.subtitle | strip_html }}</h2>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
|
@ -61,13 +61,13 @@
|
|||
<div class="row">
|
||||
<div class="col-xl-8 offset-xl-2 col-lg-10 offset-lg-1">
|
||||
<div class="{{ include.type }}-heading">
|
||||
<h1>{% if page.title %}{{ page.title }}{% else %}<br/>{% endif %}</h1>
|
||||
<h1>{% if page.title %}{{ page.title | strip_html }}{% else %}<br/>{% endif %}</h1>
|
||||
{% if page.subtitle %}
|
||||
{% if include.type == "page" %}
|
||||
<hr class="small">
|
||||
<span class="{{ include.type }}-subheading">{{ page.subtitle }}</span>
|
||||
<span class="{{ include.type }}-subheading">{{ page.subtitle | strip_html }}</span>
|
||||
{% else %}
|
||||
<h2 class="{{ include.type }}-subheading">{{ page.subtitle }}</h2>
|
||||
<h2 class="{{ include.type }}-subheading">{{ page.subtitle | strip_html }}</h2>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
{%- if link[1].first %}
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ link[0] }}</a>
|
||||
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
|
||||
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
|
||||
{%- for childlink in link[1] -%}
|
||||
{%- for linkparts in childlink %}
|
||||
<a class="dropdown-item" href="{{ linkparts[1] | relative_url }}">{{ linkparts[0] }}</a>
|
||||
|
@ -30,6 +30,14 @@
|
|||
</li>
|
||||
{%- endif -%}
|
||||
{%- endfor -%}
|
||||
{% if site.post_search %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" id="nav-search-link" href="#" title="Search">
|
||||
<span id="nav-search-icon" class="fa fa-search"></span>
|
||||
<span id="nav-search-text">Search</span>
|
||||
</a>
|
||||
</li>
|
||||
{%- endif -%}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
@ -50,3 +58,5 @@
|
|||
{% endif %}
|
||||
|
||||
</nav>
|
||||
|
||||
{% include search.html %}
|
||||
|
|
39
_includes/search.html
Normal file
39
_includes/search.html
Normal file
|
@ -0,0 +1,39 @@
|
|||
{% if site.post_search %}
|
||||
|
||||
<div id="beautifuljekyll-search-overlay">
|
||||
|
||||
<div id="nav-search-exit" title="Exit search">✕</div>
|
||||
<input type="text" id="nav-search-input" placeholder="Search">
|
||||
<ul id="search-results-container"></ul>
|
||||
|
||||
<script src="https://unpkg.com/simple-jekyll-search@latest/dest/simple-jekyll-search.min.js"></script>
|
||||
<script>
|
||||
var searchjson = '[ \
|
||||
{% for post in site.posts %} \
|
||||
{ \
|
||||
"title" : "{% if post.title != "" %}{{ post.title | strip_html | escape }}{% else %}{{ post.excerpt | strip_html | escape | strip }}{%endif%}", \
|
||||
"category" : "{{ post.tags | join: \', \' }}", \
|
||||
"url" : "{{ site.baseurl }}{{ post.url }}", \
|
||||
"date" : "{{ post.date | date: "%B %e, %Y" | default: "January 1, 1970" }}" \
|
||||
}, \
|
||||
{% endfor %} \
|
||||
{% for page in site.html_pages %}{% if page.title != "{title}" and page.title != "404 - Page not found" %} \
|
||||
{ \
|
||||
"title" : "{% if page.title != "" %}{{ page.title | strip_html | escape }}{% else %}{{ page.excerpt | strip_html | escape | strip }}{% endif %}", \
|
||||
"category" : "{% if page.tags %}{{ page.tags | join: \', \' }}{% else %}page{% endif %}", \
|
||||
"url" : "{{ site.baseurl }}{{ page.url }}", \
|
||||
"date" : "{{ page.date | date: '%B %e, %Y' | default: "January 1, 1970" }}" \
|
||||
}{% unless forloop.last %},{% endunless %} \
|
||||
{% endif %}{% endfor %} \
|
||||
]';
|
||||
searchjson = JSON.parse(searchjson);
|
||||
|
||||
var sjs = SimpleJekyllSearch({
|
||||
searchInput: document.getElementById('nav-search-input'),
|
||||
resultsContainer: document.getElementById('search-results-container'),
|
||||
json: searchjson
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
|
||||
{% endif %}
|
|
@ -1,6 +1,6 @@
|
|||
<ul class="list-inline text-center footer-links">
|
||||
|
||||
{%- if site.rss-description -%}
|
||||
{%- if site.social-network-links.rss and site.rss-description -%}
|
||||
<li class="list-inline-item">
|
||||
<a href="{{ '/feed.xml' | relative_url }}" title="RSS">
|
||||
<span class="fa-stack fa-lg" aria-hidden="true">
|
||||
|
@ -230,7 +230,7 @@
|
|||
|
||||
{%- if site.social-network-links.mastodon -%}
|
||||
<li class="list-inline-item">
|
||||
<a href="https://{{ site.social-network-links.mastodon }}" title="Mastodon">
|
||||
<a rel="me" href="https://{{ site.social-network-links.mastodon }}" title="Mastodon">
|
||||
<span class="fa-stack fa-lg" aria-hidden="true">
|
||||
<i class="fas fa-circle fa-stack-2x"></i>
|
||||
<i class="fab fa-mastodon fa-stack-1x fa-inverse"></i>
|
||||
|
@ -287,5 +287,69 @@
|
|||
</a>
|
||||
</li>
|
||||
{%- endif -%}
|
||||
|
||||
{%- if site.social-network-links.medium -%}
|
||||
<li class="list-inline-item">
|
||||
<a href="https://medium.com/@{{ site.social-network-links.medium }}" title="Medium">
|
||||
<span class="fa-stack fa-lg" aria-hidden="true">
|
||||
<i class="fas fa-circle fa-stack-2x"></i>
|
||||
<i class="fab fa-medium fa-stack-1x fa-inverse"></i>
|
||||
</span>
|
||||
<span class="sr-only">Medium</span>
|
||||
</a>
|
||||
</li>
|
||||
{%- endif -%}
|
||||
|
||||
{%- if site.social-network-links.itchio -%}
|
||||
<li class="list-inline-item">
|
||||
<a href="https://{{ site.social-network-links.itchio }}.itch.io/" title="Itchio">
|
||||
<span class="fa-stack fa-lg" aria-hidden="true">
|
||||
<i class="fas fa-circle fa-stack-2x"></i>
|
||||
<i class="fab fa-itch-io fa-stack-1x fa-inverse"></i>
|
||||
</span>
|
||||
<span class="sr-only">Itchio</span>
|
||||
</a>
|
||||
</li>
|
||||
{%- endif -%}
|
||||
|
||||
{%- if site.social-network-links.discord -%}
|
||||
{% assign discord_start = site.social-network-links.discord | split: "/" | first -%}
|
||||
{% unless discord_start == 'users' or discord_start == 'invite' -%}
|
||||
{% assign discord_url_prefix = 'invite/' -%}
|
||||
{% endunless -%}
|
||||
<li class="list-inline-item">
|
||||
<a href="https://discord.com/{{discord_url_prefix}}{{site.social-network-links.discord}}" title="Discord">
|
||||
<span class="fa-stack fa-lg" aria-hidden="true">
|
||||
<i class="fas fa-circle fa-stack-2x"></i>
|
||||
<i class="fab fa-discord fa-stack-1x fa-inverse"></i>
|
||||
</span>
|
||||
<span class="sr-only">Discord</span>
|
||||
</a>
|
||||
</li>
|
||||
{%- endif -%}
|
||||
|
||||
{%- if site.social-network-links.kaggle -%}
|
||||
<li class="list-inline-item">
|
||||
<a href="https://www.kaggle.com/{{ site.social-network-links.kaggle }}" title="Kaggle">
|
||||
<span class="fa-stack fa-lg" aria-hidden="true">
|
||||
<i class="fas fa-circle fa-stack-2x"></i>
|
||||
<i class="fab fa-kaggle fa-stack-1x fa-inverse"></i>
|
||||
</span>
|
||||
<span class="sr-only">Kaggle</span>
|
||||
</a>
|
||||
</li>
|
||||
{%- endif -%}
|
||||
|
||||
{%- if site.social-network-links.hackerrank -%}
|
||||
<li class="list-inline-item">
|
||||
<a href="https://www.hackerrank.com/{{ site.social-network-links.hackerrank }}" title="Hackerrank">
|
||||
<span class="fa-stack fa-lg" aria-hidden="true">
|
||||
<i class="fas fa-circle fa-stack-2x"></i>
|
||||
<i class="fab fa-hackerrank fa-stack-1x fa-inverse"></i>
|
||||
</span>
|
||||
<span class="sr-only">Hackerrank</span>
|
||||
</a>
|
||||
</li>
|
||||
{%- endif -%}
|
||||
|
||||
</ul>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<span class="sr-only">Share: </span>
|
||||
|
||||
{% if site.share-links-active.twitter %}
|
||||
<a href="https://twitter.com/intent/tweet?text={{ page.title | url_encode }}&url={{ page.url | absolute_url | url_encode }}"
|
||||
<a href="https://twitter.com/intent/tweet?text={{ page.title | strip_html | url_encode }}&url={{ page.url | absolute_url | url_encode }}"
|
||||
class="btn btn-social-icon btn-twitter" title="Share on Twitter">
|
||||
<span class="fab fa-fw fa-twitter" aria-hidden="true"></span>
|
||||
<span class="sr-only">Twitter</span>
|
||||
|
@ -42,6 +42,14 @@
|
|||
</a>
|
||||
{% endif %}
|
||||
|
||||
{% if site.share-links-active.reddit %}
|
||||
<a href="https://www.reddit.com/submit?url={{ page.url | absolute_url | url_encode }}"
|
||||
class="btn btn-social-icon btn-reddit" title="Share on Reddit">
|
||||
<span class="fab fa-fw fa-reddit" aria-hidden="true"></span>
|
||||
<span class="sr-only">Reddit</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
</section>
|
||||
|
||||
{% endif %}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue