From 490f46fde9a3c678e574fb0a4d1748a90fcba44a Mon Sep 17 00:00:00 2001
From: mat ess <mat@mat.services>
Date: Fri, 25 Nov 2022 17:58:48 -0500
Subject: [PATCH] Preload fewer fonts, tweak markup

---
 templates/index.html           | 4 ++--
 templates/partials/header.html | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 4559c74..d6bf24d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,11 +4,11 @@
 <span>also on
   {%- for me in config.extra.me_links -%}
   {%- if loop.last -%}
-  <span> and </span>
+  &#32;and&#32;
   {%- endif %}
   <a href="{{ me.url | safe }}" target="_blank" rel="me noopener noreferrer">{{ me.name }}</a>
   {%- if not loop.last -%},{%- else %}
 </span>
 {%- endif -%}
-{% endfor -%}
+{% endfor %}
 {% endblock main_content %}
\ No newline at end of file
diff --git a/templates/partials/header.html b/templates/partials/header.html
index 86b8ffa..a500673 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -10,11 +10,9 @@
   <link rel="icon" type="image/{{ favicon_ext }}" href="{{ get_url(path=config.extra.favicon, cachebust=true) }}" />
   {%- endif -%}
   {% for font in config.extra.fonts -%}
-  {% for style in ["Bold", "BoldItalic", "Italic", "Regular"] -%}
-  {% set font_path = '/font/' ~ font.path ~ '/' ~ font.name ~ '-' ~ style ~ '.woff2' %}
+  {% set font_path = '/font/' ~ font.path ~ '/' ~ font.name ~ '-Regular.woff2' %}
   <link rel="preload" href="{{ get_url(path=font_path, trailing_slash=false) }}" as="font" type="font/woff2" crossorigin>
   {%- endfor %}
-  {%- endfor %}
   <link href="{{ get_url(path='style/fonts.css', cachebust=true) }}" rel="stylesheet preload" as="style" />
   {# Atom #}
   {%- block rss -%}
@@ -51,10 +49,10 @@
   <meta property="og:image" content="{{ get_url(path=current_path) }}/hero.webp">
   {%- endif -%}
   {#- Twitter #}
-  <meta property="twitter:card" content="summary_large_image">
   <meta property="twitter:title" content="{{ current_title }}">
   <meta property="twitter:description" content="{{ current_description }}">
   {%- if hero -%}
   <meta property="twitter:image" content="{{ get_url(path=current_path) }}/hero.webp">
+  <meta property="twitter:card" content="summary_large_image">
   {%- endif %}
-</head>
\ No newline at end of file
+</head>