From 7b32086d5afa1162e350ae0777920028f14d9098 Mon Sep 17 00:00:00 2001
From: Nicolas MASSE <nicolas.masse@itix.fr>
Date: Fri, 15 Jan 2021 09:59:36 +0100
Subject: [PATCH] Core Web Vitals: inline svg

---
 layouts/partials/article-headline.html    | 2 +-
 layouts/partials/head.html                | 2 --
 {static => layouts/partials}/icons/en.svg | 4 ++--
 layouts/partials/icons/fr.svg             | 6 ++++++
 layouts/partials/menu.html                | 4 ++--
 static/icons/fr.svg                       | 2 --
 6 files changed, 11 insertions(+), 9 deletions(-)
 rename {static => layouts/partials}/icons/en.svg (87%)
 create mode 100644 layouts/partials/icons/fr.svg
 delete mode 100644 static/icons/fr.svg

diff --git a/layouts/partials/article-headline.html b/layouts/partials/article-headline.html
index 75d8afc..84dda21 100644
--- a/layouts/partials/article-headline.html
+++ b/layouts/partials/article-headline.html
@@ -3,7 +3,7 @@
 <h4><a href="{{ .current.RelPermalink }}">{{ .current.Title }}
 {{- partial "lang-detection.html" .current -}}
 {{ if .current.Scratch.Get "en_article_in_fr_site" }}
-    <img src="/icons/en.svg" class="tiny-flag" alt="en flag" width="28" height="14">
+{{- partial "icons/en.svg" . -}}
 {{ end }}
 </a></h4>
 {{- partial "post-metadata.html" . -}}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 64474bd..ed7b058 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -23,8 +23,6 @@
 <link rel="preload" href="/fonts/SourceSansPro-Regular.ttf" as="font" type="font/ttf" crossorigin="anonymous">
 <link rel="preload" href="/fonts/material-icons.woff2" as="font" type="font/woff2" crossorigin="anonymous">
 <link rel="preload" href="/fonts/material-icons.ttf" as="font" type="font/ttf" crossorigin="anonymous">
-<link rel="preload" href="/icons/en.svg" as="image" type="image/svg+xml">
-<link rel="preload" href="/icons/fr.svg" as="image" type="image/svg+xml">
 
 <!--
   -- Ensure the <meta name=description> tag is never empty since it is used
diff --git a/static/icons/en.svg b/layouts/partials/icons/en.svg
similarity index 87%
rename from static/icons/en.svg
rename to layouts/partials/icons/en.svg
index 3b33fad..fb59cf0 100644
--- a/static/icons/en.svg
+++ b/layouts/partials/icons/en.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="1200" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="28" height="14" class="tiny-flag">
+<title>British flag</title>
 <clipPath id="s">
 	<path d="M0,0 v30 h60 v-30 z"/>
 </clipPath>
diff --git a/layouts/partials/icons/fr.svg b/layouts/partials/icons/fr.svg
new file mode 100644
index 0000000..34f2b8d
--- /dev/null
+++ b/layouts/partials/icons/fr.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="21" height="14" class="tiny-flag">
+<title>French flag</title>
+<rect width="21" height="14" fill="#ED2939"/>
+<rect width="14" height="14" fill="#fff"/>
+<rect width="7" height="14" fill="#002395"/>
+</svg>
\ No newline at end of file
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index ec6f2f4..bd5239a 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -45,12 +45,12 @@
             {{- if .IsTranslated -}}
             <!-- Try to redirect the user to the translated page if possible -->
             {{- range .AllTranslations }}
-            <a href="{{ .RelPermalink }}"><img src="/icons/{{ .Lang }}.svg" class="tiny-flag" width="28" height="14" alt="{{ .Lang }} flag"></a>
+            <a href="{{ .RelPermalink }}">{{- partial (printf "icons/%s.svg" .Lang) . -}}</a>
             {{- end -}}
             {{- else -}}
             <!-- Otherwise, redirect it to the homepage -->
             {{- range site.Sites }}
-            <a href="{{ .Home.RelPermalink }}"><img src="/icons/{{ .Language.Lang }}.svg" class="tiny-flag" width="28" height="14" alt="{{ .Language.Lang }} flag"></a>
+            <a href="{{ .Home.RelPermalink }}">{{- partial (printf "icons/%s.svg" .Language.Lang) . -}}</a>
             {{- end -}}
             {{- end }}
         </div>
diff --git a/static/icons/fr.svg b/static/icons/fr.svg
deleted file mode 100644
index b50bd7e..0000000
--- a/static/icons/fr.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="900" height="600"><rect width="900" height="600" fill="#ED2939"/><rect width="600" height="600" fill="#fff"/><rect width="300" height="600" fill="#002395"/></svg>
\ No newline at end of file