Merge upstream and update Gemfile.lock
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<head>
|
||||
<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">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, viewport-fit=cover">
|
||||
|
||||
<title>{% if page.use-site-title %}{{ site.title }} {{ site.title-separator }} {{ site.description }}{% elsif page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
|
||||
|
||||
@@ -11,8 +11,9 @@
|
||||
<meta name="description" content="{{ page.subtitle }}">
|
||||
{% endif %}
|
||||
|
||||
<link rel="alternate" type="application/rss+xml" title="{{ site.title }} {{ site.title-separator }} {{ site.description }}" href="{{ site.baseurl }}/feed.xml" />
|
||||
<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 %}
|
||||
|
||||
@@ -24,7 +25,7 @@
|
||||
|
||||
{% if layout.common-css %}
|
||||
{% for css in layout.common-css %}
|
||||
<link rel="stylesheet" href="{{ css | prepend: site.baseurl | replace: '//', '/' }}" />
|
||||
<link rel="stylesheet" href="{{ css | relative_url }}" />
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
@@ -42,7 +43,7 @@
|
||||
|
||||
{% if page.css %}
|
||||
{% for css in page.css %}
|
||||
<link rel="stylesheet" href="{{ css | prepend: site.baseurl | replace: '//', '/' }}" />
|
||||
<link rel="stylesheet" href="{{ css | relative_url }}" />
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
@@ -77,17 +78,17 @@
|
||||
<meta property="og:type" content="website" />
|
||||
|
||||
{% if page.id %}
|
||||
<meta property="og:url" content="{{ site.url }}{{ page.url }}" />
|
||||
<link rel="canonical" href="{{ site.url }}{{ page.url }}" />
|
||||
<meta property="og:url" content="{{ page.url | absolute_url }}" />
|
||||
<link rel="canonical" href="{{ page.url | absolute_url }}" />
|
||||
{% else %}
|
||||
<meta property="og:url" content="{{ site.url }}{{ page.url | remove: '/index.html' | remove: '.html' }}" />
|
||||
<link rel="canonical" href="{{ site.url }}{{ page.url | remove: '/index.html' | remove: '.html' }}" />
|
||||
<meta property="og:url" content="{{ page.url | absolute_url | strip_index }}" />
|
||||
<link rel="canonical" href="{{ page.url | absolute_url | strip_index }}" />
|
||||
{% endif %}
|
||||
|
||||
{% if page.share-img %}
|
||||
<meta property="og:image" content="{{ page.share-img }}" />
|
||||
{% elsif site.avatar %}
|
||||
<meta property="og:image" content="{{ site.url }}{{ site.avatar }}" />
|
||||
<meta property="og:image" content="{{ site.avatar | absolute_url }}" />
|
||||
{% endif %}
|
||||
|
||||
|
||||
@@ -115,11 +116,16 @@
|
||||
{% if page.share-img %}
|
||||
<meta name="twitter:image" content="{{ page.share-img }}" />
|
||||
{% elsif site.avatar %}
|
||||
<meta name="twitter:image" content="{{ site.url }}{{ 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 %}
|
||||
<!-- Staticman -->
|
||||
<link rel="stylesheet" href="{{ "/css/staticman.css" | relative_url }}" />
|
||||
{% endif %}
|
||||
|
||||
</head>
|
||||
|
||||
Reference in New Issue
Block a user