fix head.html conflicts
All checks were successful
Build and Deploy Test Version (with Drafts) - next.asandikci.com / build-drafts-and-deploy (push) Successful in 1m10s
All checks were successful
Build and Deploy Test Version (with Drafts) - next.asandikci.com / build-drafts-and-deploy (push) Successful in 1m10s
This commit is contained in:
parent
b0bfb363ae
commit
a11f5a5d97
GPG key ID:
A3B47D76845BEDF3
1 changed files with 100 additions and 128 deletions
|
|
@ -1,142 +1,115 @@
|
|||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||
<meta
|
||||
name="theme-color"
|
||||
media="(prefers-color-scheme: light)"
|
||||
content="#f7f7f7"
|
||||
/>
|
||||
<meta
|
||||
name="theme-color"
|
||||
media="(prefers-color-scheme: dark)"
|
||||
content="#1b1b1e"
|
||||
/>
|
||||
<meta name="mobile-web-app-capable" content="yes" />
|
||||
<meta
|
||||
name="apple-mobile-web-app-status-bar-style"
|
||||
content="black-translucent"
|
||||
/>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<meta name="theme-color" media="(prefers-color-scheme: light)" content="#f7f7f7">
|
||||
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="#1b1b1e">
|
||||
<meta name="mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
|
||||
<meta
|
||||
name="viewport"
|
||||
content="width=device-width, user-scalable=no initial-scale=1, shrink-to-fit=no, viewport-fit=cover"
|
||||
/>
|
||||
>
|
||||
|
||||
{%- capture seo_tags -%} {% seo title=false %} {%- endcapture -%}
|
||||
{%- capture seo_tags -%}
|
||||
{% seo title=false %}
|
||||
{%- endcapture -%}
|
||||
|
||||
<!-- Setup Open Graph image -->
|
||||
|
||||
{% if page.image %} {% assign src = page.image.path | default: page.image %}
|
||||
{% unless src contains '://' %} {%- capture img_url -%} {% include
|
||||
media-url.html src=src subpath=page.media_subpath absolute=true %} {%-
|
||||
endcapture -%} {%- capture old_url -%}{{ src | absolute_url }}{%- endcapture
|
||||
-%} {%- capture new_url -%}{{ img_url }}{%- endcapture -%} {% assign seo_tags
|
||||
= seo_tags | replace: old_url, new_url %} {% endunless %} {% elsif
|
||||
site.social_preview_image %} {%- capture img_url -%} {% include media-url.html
|
||||
src=site.social_preview_image absolute=true %} {%- endcapture -%} {%- capture
|
||||
og_image -%}
|
||||
{% if page.image %}
|
||||
{% assign src = page.image.path | default: page.image %}
|
||||
|
||||
{% unless src contains '://' %}
|
||||
{%- capture img_url -%}
|
||||
{% include media-url.html src=src subpath=page.media_subpath absolute=true %}
|
||||
{%- endcapture -%}
|
||||
|
||||
{%- capture old_url -%}{{ src | absolute_url }}{%- endcapture -%}
|
||||
{%- capture new_url -%}{{ img_url }}{%- endcapture -%}
|
||||
|
||||
{% assign seo_tags = seo_tags | replace: old_url, new_url %}
|
||||
{% endunless %}
|
||||
|
||||
{% elsif site.social_preview_image %}
|
||||
{%- capture img_url -%}
|
||||
{% include media-url.html src=site.social_preview_image absolute=true %}
|
||||
{%- endcapture -%}
|
||||
|
||||
{%- capture og_image -%}
|
||||
<meta property="og:image" content="{{ img_url }}" />
|
||||
{%- endcapture -%} {%- capture twitter_image -%}
|
||||
{%- endcapture -%}
|
||||
|
||||
{%- capture twitter_image -%}
|
||||
<meta name="twitter:card" content="summary_large_image" />
|
||||
<meta property="twitter:image" content="{{ img_url }}" />
|
||||
{%- endcapture -%} {% assign old_meta_clip = '
|
||||
<meta name="twitter:card" content="summary" />
|
||||
' %} {% assign new_meta_clip = og_image | append: twitter_image %} {% assign
|
||||
seo_tags = seo_tags | replace: old_meta_clip, new_meta_clip %} {% endif %} {{
|
||||
seo_tags }}
|
||||
{%- endcapture -%}
|
||||
|
||||
{% assign old_meta_clip = '<meta name="twitter:card" content="summary" />' %}
|
||||
{% assign new_meta_clip = og_image | append: twitter_image %}
|
||||
{% assign seo_tags = seo_tags | replace: old_meta_clip, new_meta_clip %}
|
||||
{% endif %}
|
||||
|
||||
{{ seo_tags }}
|
||||
|
||||
<title>
|
||||
{%- unless page.layout == 'home' -%} {{ page.title | append: ' | ' }} {%-
|
||||
endunless -%} {{ site.title }}
|
||||
{%- unless page.layout == 'home' -%}
|
||||
{{ page.title | append: ' | ' }}
|
||||
{%- endunless -%}
|
||||
{{ site.title }}
|
||||
</title>
|
||||
|
||||
{% include_cached favicons.html %}
|
||||
|
||||
<!-- Resource Hints -->
|
||||
{% unless site.assets.self_host.enabled %} {% for hint in
|
||||
site.data.origin.cors.resource_hints %} {% for link in hint.links %} <link
|
||||
rel="{{ link.rel }}" href="{{ hint.url }}" {{ link.opts | join: ' ' }}> {%
|
||||
endfor %} {% endfor %} {% endunless %}
|
||||
{% unless site.assets.self_host.enabled %}
|
||||
{% for hint in site.data.origin.cors.resource_hints %}
|
||||
{% for link in hint.links %}
|
||||
<link rel="{{ link.rel }}" href="{{ hint.url }}" {{ link.opts | join: ' ' }}>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
{% endunless %}
|
||||
|
||||
<!-- Bootstrap -->
|
||||
{% unless jekyll.environment == 'production' %} <<<<<<< HEAD
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
|
||||
/>
|
||||
||||||| d51345e
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
|
||||
/>
|
||||
=======
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
|
||||
/>
|
||||
>>>>>>> upstream_master {% endunless %}
|
||||
|
||||
<!-- Font Logos -->
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="{{ site.data.origin[type].fontlogos.css | relative_url }}"
|
||||
/>
|
||||
|
||||
<!-- Font Awesome Icons -->
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="{{ site.data.origin[type].fontawesome.css | relative_url }}"
|
||||
/>
|
||||
|
||||
<!-- Fork Awesome [added by asandikci] -->
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="{{ site.data.origin[type].forkawesome.css | relative_url }}"
|
||||
integrity="sha256-XoaMnoYC5TH6/+ihMEnospgm0J1PM/nioxbOUdnM8HY="
|
||||
crossorigin="anonymous"
|
||||
/>
|
||||
|
||||
<!-- Balloon CSS [added by asandikci] -->
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="{{ site.data.origin[type].ballooncss.css | relative_url }}"
|
||||
/>
|
||||
{% unless jekyll.environment == 'production' %}
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css">
|
||||
{% endunless %}
|
||||
|
||||
<!-- Theme style -->
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="{{ '/assets/css/:THEME.css' | replace: ':THEME', site.theme | relative_url }}"
|
||||
/>
|
||||
<link rel="stylesheet" href="{{ '/assets/css/:THEME.css' | replace: ':THEME', site.theme | relative_url }}">
|
||||
|
||||
<!-- Web Font -->
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="{{ site.data.origin[type].webfonts | relative_url }}"
|
||||
/>
|
||||
<link rel="stylesheet" href="{{ site.data.origin[type].webfonts | relative_url }}">
|
||||
|
||||
<!-- Font Awesome Icons -->
|
||||
<link rel="stylesheet" href="{{ site.data.origin[type].fontawesome.css | relative_url }}">
|
||||
|
||||
<!-- Fork Awesome [added by asandikci] -->
|
||||
<link rel="stylesheet" href="{{ site.data.origin[type].forkawesome.css | relative_url }}" integrity="sha256-XoaMnoYC5TH6/+ihMEnospgm0J1PM/nioxbOUdnM8HY=" crossorigin="anonymous"/>
|
||||
|
||||
<!-- Balloon CSS [added by asandikci] -->
|
||||
<link rel="stylesheet" href="{{ site.data.origin[type].ballooncss.css | relative_url }}" />
|
||||
|
||||
|
||||
<!-- 3rd-party Dependencies -->
|
||||
{% if site.toc and page.toc %}
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="{{ site.data.origin[type].toc.css | relative_url }}"
|
||||
/>
|
||||
{% endif %} {% if page.layout == 'post' or page.layout == 'page' or
|
||||
page.layout == 'home' %}
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="{{ site.data.origin[type]['lazy-polyfill'].css | relative_url }}"
|
||||
/>
|
||||
{% endif %} {% if page.layout == 'page' or page.layout == 'post' %}
|
||||
<link rel="stylesheet" href="{{ site.data.origin[type].toc.css | relative_url }}">
|
||||
{% endif %}
|
||||
|
||||
{% if page.layout == 'post' or page.layout == 'page' or page.layout == 'home' %}
|
||||
<link rel="stylesheet" href="{{ site.data.origin[type]['lazy-polyfill'].css | relative_url }}">
|
||||
{% endif %}
|
||||
|
||||
{% if page.layout == 'page' or page.layout == 'post' %}
|
||||
<!-- Image Popup -->
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="{{ site.data.origin[type].glightbox.css | relative_url }}"
|
||||
/>
|
||||
<link rel="stylesheet" href="{{ site.data.origin[type].glightbox.css | relative_url }}">
|
||||
{% endif %}
|
||||
|
||||
<!-- Scripts -->
|
||||
|
||||
<script src="{{ '/assets/js/dist/theme.min.js' | relative_url }}"></script>
|
||||
|
||||
{% include js-selector.html lang=lang %} {% if jekyll.environment ==
|
||||
'production' %}
|
||||
{% include js-selector.html lang=lang %}
|
||||
|
||||
{% if jekyll.environment == 'production' %}
|
||||
<!-- PWA -->
|
||||
{% if site.pwa.enabled %}
|
||||
<script
|
||||
|
|
@ -146,15 +119,14 @@
|
|||
{% endif %}
|
||||
|
||||
<!-- Web Analytics -->
|
||||
{% for analytics in site.analytics %} {% capture str %}{{ analytics }}{%
|
||||
endcapture %} {% assign platform = str | split: '{' | first %} {% if
|
||||
site.analytics[platform].id and site.analytics[platform].id != empty %} {%
|
||||
include analytics/{{ platform }}.html %} {% endif %} {% endfor %} {% endif %}
|
||||
{% for analytics in site.analytics %}
|
||||
{% capture str %}{{ analytics }}{% endcapture %}
|
||||
{% assign platform = str | split: '{' | first %}
|
||||
{% if site.analytics[platform].id and site.analytics[platform].id != empty %}
|
||||
{% include analytics/{{ platform }}.html %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
<!-- Web Analytics -->
|
||||
{% for analytics in site.analytics %} {% capture str %}{{ analytics }}{%
|
||||
endcapture %} {% assign platform = str | split: '{' | first %} {% if
|
||||
site.analytics[platform].id and site.analytics[platform].id != empty %} {%
|
||||
include analytics/{{ platform }}.html %} {% endif %} {% endfor %} {% endif %}
|
||||
{% include metadata-hook.html %}
|
||||
</head>
|
||||
Loading…
Reference in a new issue