Merge upstream
This commit is contained in:
@@ -1,52 +1,21 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, viewport-fit=cover">
|
||||
|
||||
{% capture title %}
|
||||
{%- if page.share-title -%}
|
||||
{{ page.share-title | strip_html | xml_escape }}
|
||||
{%- elsif page.title -%}
|
||||
{{ page.title | strip_html | xml_escape }}
|
||||
{%- else -%}
|
||||
{{ site.title | strip_html | xml_escape }}
|
||||
{%- endif -%}
|
||||
{% endcapture %}
|
||||
<title>{% if page.use-site-title %}{{ site.title }} {{ site.title-separator }} {{ site.description }}{% elsif page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
|
||||
|
||||
{% capture description %}
|
||||
{%- if page.share-description -%}
|
||||
{{ page.share-description | strip_html | xml_escape }}
|
||||
{%- elsif page.subtitle -%}
|
||||
{{ page.subtitle | strip_html | xml_escape }}
|
||||
{%- else -%}
|
||||
{%- assign excerpt_length = site.excerpt_length | default: 50 -%}
|
||||
{{ page.content | strip_html | xml_escape | truncatewords: excerpt_length | strip }}
|
||||
{%- endif -%}
|
||||
{% endcapture %}
|
||||
<meta name="author" content="{{ site.author.name }}" />
|
||||
|
||||
<title>{{ title }}</title>
|
||||
|
||||
{% if site.author %}
|
||||
<meta name="author" content="{{ site.author }}">
|
||||
{% if page.subtitle %}
|
||||
<meta name="description" content="{{ page.subtitle }}">
|
||||
{% endif %}
|
||||
|
||||
<meta name="description" content="{{ description }}">
|
||||
|
||||
{% if site.mobile-theme-col %}
|
||||
<meta name="theme-color" content="{{ site.mobile-theme-col }}">
|
||||
{% endif %}
|
||||
|
||||
{% if site.keywords %}
|
||||
<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 %}
|
||||
<link rel="alternate" type="application/rss+xml" title="{{ site.title }} {{ site.title-separator }} {{ site.description }}" href="{{ '/feed.xml' | absolute_url }}" />
|
||||
|
||||
{% 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 %}
|
||||
@@ -56,13 +25,13 @@
|
||||
|
||||
{% if layout.common-css %}
|
||||
{% for css in layout.common-css %}
|
||||
<link rel="stylesheet" href="{{ css | relative_url }}">
|
||||
<link rel="stylesheet" href="{{ css | relative_url }}" />
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
{% if site.site-css %}
|
||||
{% for css in site.site-css %}
|
||||
<link rel="stylesheet" href="{{ css | relative_url }}">
|
||||
{% if layout.common-googlefonts %}
|
||||
{% for font in layout.common-googlefonts %}
|
||||
<link rel="stylesheet" href="//fonts.googleapis.com/css?family={{ font }}" />
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
@@ -71,82 +40,92 @@
|
||||
{% include ext-css.html css=css %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
|
||||
{% if page.css %}
|
||||
{% for css in page.css %}
|
||||
<link rel="stylesheet" href="{{ css | relative_url }}">
|
||||
<link rel="stylesheet" href="{{ css | relative_url }}" />
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
{% if page.googlefonts %}
|
||||
{% for font in page.googlefonts %}
|
||||
<link rel="stylesheet" href="//fonts.googleapis.com/css?family={{ font }}" />
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
<!-- Facebook OpenGraph tags -->
|
||||
{% if site.fb_app_id %}
|
||||
<meta property="fb:app_id" content="{{ site.fb_app_id }}">
|
||||
<meta property="fb:app_id" content="{{ site.fb_app_id }}" />
|
||||
{% endif %}
|
||||
|
||||
{% if site.title %}
|
||||
<meta property="og:site_name" content="{{ site.title }}">
|
||||
{% if page.meta-title %}
|
||||
<meta property="og:title" content="{{ page.meta-title }}" />
|
||||
{% elsif page.title %}
|
||||
<meta property="og:title" content="{{ page.title }}" />
|
||||
{% else %}
|
||||
<meta property="og:title" content="{{ site.title }}" />
|
||||
{% endif %}
|
||||
|
||||
{%- capture img -%}
|
||||
{%- if page.share-img -%}
|
||||
{{ page.share-img }}
|
||||
{%- elsif page.cover-img -%}
|
||||
{%- if page.cover-img.first -%}
|
||||
{{ page.cover-img[0].first.first }}
|
||||
{%- else -%}
|
||||
{{ page.cover-img }}
|
||||
{%- endif -%}
|
||||
{%- elsif page.thumbnail-img -%}
|
||||
{{ page.thumbnail-img }}
|
||||
{%- elsif site.avatar -%}
|
||||
{{ site.avatar }}
|
||||
{% endif %}
|
||||
{%- endcapture -%}
|
||||
{%- assign img=img | strip -%}
|
||||
|
||||
<meta property="og:title" content="{{ title }}">
|
||||
<meta property="og:description" content="{{ description }}">
|
||||
|
||||
{% if img != "" %}
|
||||
<meta property="og:image" content="{{ img | absolute_url }}">
|
||||
{% if page.meta-description %}
|
||||
<meta property="og:description" content="{{ page.meta-description }}">
|
||||
{% elsif page.subtitle %}
|
||||
<meta property="og:description" content="{{ page.subtitle }}">
|
||||
{% else %}
|
||||
<meta property="og:description" content="{{ page.content | strip_html | xml_escape | truncatewords: 50 }}">
|
||||
{% endif %}
|
||||
|
||||
|
||||
<meta property="og:type" content="website" />
|
||||
|
||||
{% if page.id %}
|
||||
<meta property="og:type" content="article">
|
||||
<meta property="og:article:author" content="{{ site.author }}">
|
||||
<meta property="og:article:published_time" content="{{ page.date | date_to_xmlschema }}">
|
||||
<meta property="og:url" content="{{ page.url | absolute_url }}">
|
||||
<link rel="canonical" href="{{ page.url | absolute_url }}">
|
||||
<meta property="og:url" content="{{ page.url | absolute_url }}" />
|
||||
<link rel="canonical" href="{{ page.url | absolute_url }}" />
|
||||
{% else %}
|
||||
<meta property="og:type" content="website">
|
||||
<meta property="og:url" content="{{ page.url | absolute_url | strip_index }}">
|
||||
<link rel="canonical" href="{{ page.url | absolute_url | strip_index }}">
|
||||
<meta property="og:url" content="{{ page.url | absolute_url | strip_index }}" />
|
||||
<link rel="canonical" href="{{ page.url | absolute_url | strip_index }}" />
|
||||
{% endif %}
|
||||
|
||||
{% if img != "" and img != site.avatar %}
|
||||
<meta name="twitter:card" content="summary_large_image">
|
||||
{% if page.share-img %}
|
||||
<meta property="og:image" content="{{ page.share-img }}" />
|
||||
{% elsif site.avatar %}
|
||||
<meta property="og:image" content="{{ site.avatar | absolute_url }}" />
|
||||
{% endif %}
|
||||
|
||||
|
||||
<!-- Twitter summary cards -->
|
||||
<meta name="twitter:card" content="summary" />
|
||||
<meta name="twitter:site" content="@{{ site.author.twitter }}" />
|
||||
<meta name="twitter:creator" content="@{{ site.author.twitter }}" />
|
||||
|
||||
{% if page.meta-title %}
|
||||
<meta name="twitter:title" content="{{ page.meta-title }}" />
|
||||
{% elsif page.title %}
|
||||
<meta name="twitter:title" content="{{ page.title }}" />
|
||||
{% else %}
|
||||
<meta name="twitter:card" content="summary">
|
||||
{% endif %}
|
||||
<meta name="twitter:site" content="@{{ site.social-network-links.twitter }}">
|
||||
<meta name="twitter:creator" content="@{{ site.social-network-links.twitter }}">
|
||||
|
||||
<meta property="twitter:title" content="{{ title }}">
|
||||
<meta property="twitter:description" content="{{ description }}">
|
||||
|
||||
{% if img != "" %}
|
||||
<meta name="twitter:image" content="{{ img | absolute_url }}">
|
||||
<meta name="twitter:title" content="{{ site.title }}" />
|
||||
{% endif %}
|
||||
|
||||
{% if page.meta-description %}
|
||||
<meta name="twitter:description" content="{{ page.meta-description }}">
|
||||
{% elsif page.subtitle %}
|
||||
<meta name="twitter:description" content="{{ page.subtitle }}">
|
||||
{% else %}
|
||||
<meta name="twitter:description" content="{{ page.content | strip_html | xml_escape | truncatewords: 50 }}">
|
||||
{% endif %}
|
||||
|
||||
{% if page.share-img %}
|
||||
<meta name="twitter:image" content="{{ page.share-img }}" />
|
||||
{% elsif site.avatar %}
|
||||
<meta name="twitter:image" content="{{ site.avatar | absolute_url }}" />
|
||||
{% endif %}
|
||||
|
||||
{% if site.matomo %}
|
||||
{% include matomo.html %}
|
||||
{% endif %}
|
||||
|
||||
{% if page.comments and site.staticman.repository and site.staticman.branch %}
|
||||
<link rel="stylesheet" href="{{ "/assets/css/staticman.css" | relative_url }}">
|
||||
{% endif %}
|
||||
|
||||
{% if page.head-extra %}
|
||||
{% for file in page.head-extra %}
|
||||
{% include {{ file }} %}
|
||||
{% endfor %}
|
||||
<!-- Staticman -->
|
||||
<link rel="stylesheet" href="{{ "/css/staticman.css" | relative_url }}" />
|
||||
{% endif %}
|
||||
|
||||
</head>
|
||||
|
||||
Reference in New Issue
Block a user