Skip to content

Commit eeb5c18

Browse files
khaledhosnykhaledhosny
committed
Factor shared <head> into an include
1 parent bc84ce7 commit eeb5c18

4 files changed

Lines changed: 48 additions & 46 deletions

File tree

‎_includes/head.html‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{% include analytics.html %}
2+
<meta charset="UTF-8">
3+
<meta name="viewport" content="width=device-width, initial-scale=1">
4+
<link rel="shortcut icon" href="{{ include.favicon }}">
5+
6+
<title>{{ page.title | default: include.title }} | {{ page.subtitle | default: include.subtitle }}</title>
7+
<meta name="author" content="Khaled Hosny" />
8+
<meta name="fediverse:creator" content="@khaled@typo.social" />
9+
<meta property="og:locale" content="{{ page.language }}">
10+
{% if include.description %}
11+
<meta name="description" content="{{ include.description | strip_html | strip }}">
12+
<meta property="og:description" content="{{ include.description | strip_html | strip }}">
13+
<link rel="canonical" href="{{ site.url }}{{ page.url }}">
14+
<meta property="og:url" content="{{ site.url }}{{ page.url }}">
15+
<meta property="og:site_name" content="{{ include.site_name }}">
16+
<meta property="og:image" content="{{ include.og_image }}">
17+
{% endif %}
18+
{% if include.manifest %}
19+
<link rel="apple-touch-icon" href="/assets/images/logo.png">
20+
<link rel="manifest" href="{{ include.manifest }}">
21+
{% endif %}
22+
<link rel="stylesheet" href="{{ '/assets/css/' | append: include.css | append: '.css?v=' | append: site.github.build_revision }}">

‎_layouts/app.html‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,14 @@
1919
{% assign messages = site.data.messages[page.language] %}
2020
{% assign config = site.data.config[project] %}
2121
<html lang="{{ page.language }}" dir="{{ page.direction | default: rtl }}">
22+
{% assign favicon_path = "/assets/images/" | append: project | append: "/favicon.svg" %}
2223
<head>
23-
{% include analytics.html %}
24-
<meta charset="UTF-8">
25-
<meta name="viewport" content="width=device-width, initial-scale=1">
26-
<link rel="shortcut icon" href="/assets/images/{{ project }}/favicon.svg">
27-
<title>{{ page.title | default: config.title }} | {{ page.subtitle | default: config.subtitle }}</title>
28-
<meta name="author" content="Khaled Hosny" />
29-
<meta name="fediverse:creator" content="@khaled@typo.social" />
30-
<meta property="og:locale" content="{{ page.language }}">
31-
32-
<link rel="apple-touch-icon" href="/assets/images/logo.png">
33-
<link rel="manifest" href="./app.webmanifest">
34-
<link rel="stylesheet" href="{{ "/assets/css/app.css?v=" | append: site.github.build_revision }}">
24+
{% include head.html
25+
css="app"
26+
favicon=favicon_path
27+
title=config.title
28+
subtitle=config.subtitle
29+
manifest="./app.webmanifest" %}
3530
</head>
3631
<body>
3732
{% include nav.html %}

‎_layouts/default.html‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,14 @@
22
{% assign messages = site.data.messages[page.language] %}
33
<html lang="{{ page.language }}" dir="{{ page.direction | default: rtl }}">
44
<head>
5-
{% include analytics.html %}
6-
<meta charset="UTF-8">
7-
<meta name="viewport" content="width=device-width, initial-scale=1">
8-
<link rel="shortcut icon" href="/assets/images/favicon.svg">
9-
10-
<title>{{ page.title | default: site.title }} | {{ page.subtitle | default: site.description }}</title>
11-
<meta name="author" content="Khaled Hosny" />
12-
<meta name="fediverse:creator" content="@khaled@typo.social" />
13-
<meta property="og:locale" content="{{ page.language }}">
14-
<meta name="description" content="{{ messages.description | strip_html | strip }}">
15-
<meta property="og:description" content="{{ messages.description | strip_html | strip }}">
16-
<link rel="canonical" href="{{ site.url }}{{ page.url }}">
17-
<meta property="og:url" content="{{ site.url }}{{ page.url }}">
18-
<meta property="og:site_name" content="{{ site.title }}">
19-
<meta property="og:image" content="{{ "/assets/images/card.png" | relative_url }}">
20-
21-
<link rel="stylesheet" href="{{ "/assets/css/default.css?v=" | append: site.github.build_revision }}">
5+
{% include head.html
6+
css="default"
7+
favicon="/assets/images/favicon.svg"
8+
title=site.title
9+
subtitle=site.description
10+
description=messages.description
11+
site_name=site.title
12+
og_image="/assets/images/card.png" %}
2213
</head>
2314
<body>
2415
{% include nav.html %}

‎_layouts/font.html‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,18 @@
33
{% assign messages = site.data.messages[page.language] %}
44
{% assign config = site.data.config[project] %}
55
<html lang="{{ page.language }}" dir="{{ page.direction | default: rtl }}">
6+
{% assign favicon_path = "/assets/images/" | append: project | append: "/favicon.svg" %}
7+
{% assign og_image_path = "/assets/images/" | append: project | append: "/card.png" %}
8+
{% assign description = messages[project].description %}
69
<head>
7-
{% include analytics.html %}
8-
<meta charset="UTF-8">
9-
<meta name="viewport" content="width=device-width, initial-scale=1">
10-
<link rel="shortcut icon" href="/assets/images/{{ project }}/favicon.svg">
11-
12-
<title>{{ page.title | default: config.title }} | {{ page.subtitle | default: config.subtitle }}</title>
13-
<meta name="author" content="Khaled Hosny" />
14-
<meta name="fediverse:creator" content="@khaled@typo.social" />
15-
<meta property="og:locale" content="{{ page.language }}">
16-
<meta name="description" content="{{ messages[project].description | strip_html | strip }}">
17-
<meta property="og:description" content="{{ messages[project].description | strip_html | strip }}">
18-
<link rel="canonical" href="{{ site.url }}{{ page.url }}">
19-
<meta property="og:url" content="{{ site.url }}{{ page.url }}">
20-
<meta property="og:site_name" content="{{ config.title }}">
21-
<meta property="og:image" content="/assets/images/{{ project }}/card.png">
22-
23-
<link rel="stylesheet" href="{{ "/assets/css/" | append: project | append: ".css?v=" | append: site.github.build_revision }}">
10+
{% include head.html
11+
css=project
12+
favicon=favicon_path
13+
title=config.title
14+
subtitle=config.subtitle
15+
description=description
16+
site_name=config.title
17+
og_image=og_image_path %}
2418
</head>
2519
<body>
2620
{% include nav.html %}

0 commit comments

Comments
 (0)