From 59046fd13786964a01e0b7c8c8923a1c5134cddd Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Wed, 2 Aug 2023 15:01:39 +0100
Subject: Update theme syntax highlighting

---
 themes/ymherklotz/layouts/partials/footer.html     | 29 +++++++++-----
 themes/ymherklotz/layouts/partials/head.html       |  2 -
 .../static/assets/fontawesome/circle-regular.svg   |  2 +-
 themes/ymherklotz/static/css/default.css           | 45 ++++++++++++----------
 4 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/themes/ymherklotz/layouts/partials/footer.html b/themes/ymherklotz/layouts/partials/footer.html
index 25120d0..a60cf66 100644
--- a/themes/ymherklotz/layouts/partials/footer.html
+++ b/themes/ymherklotz/layouts/partials/footer.html
@@ -1,15 +1,26 @@
 <footer>
   <p class="social">
     <a href="/docs/ymherklotz.asc.txt" aria-label="View public GPG
-    key"><img class="icon" alt="Key Icon" width="16" height="16" src="{{ .Site.BaseURL }}/assets/fontawesome/key-solid.svg" /></a>
-    <a href="https://github.com/ymherklotz" aria-label="View Github profile"><img class="icon" alt="Github Icon" width="16" height="16" src="{{ .Site.BaseURL }}/assets/fontawesome/github-brands.svg" /></a>
-    <a href="https://sr.ht/~ymherklotz" aria-label="View Sourcehut profile"><img class="icon" alt="Sourcehut Icon" width="16" height="16" src="{{ .Site.BaseURL }}/assets/fontawesome/circle-regular.svg" /></a>
-    <a href="https://twitter.com/@ymherklotz" aria-label="View Twitter profile"><img class="icon" alt="Twitter Icon" width="16" height="16" src="{{ .Site.BaseURL
-    }}/assets/fontawesome/twitter-brands.svg" /></a>
-    <a rel="me" href="https://types.pl/@ymherklotz" aria-label="View Mastodon profile"><img class="icon"
-    alt="Mastodon Icon" width="16" height="16" src="{{ .Site.BaseURL }}/assets/fontawesome/mastodon-brands.svg" /></a>
-    <a href="mailto:yann@yannherklotz.com" aria-label="Send me an email"><img class="icon" alt="Mail Icon" width="16" height="16" src="{{ .Site.BaseURL }}/assets/fontawesome/envelope-solid.svg" /></a>
-    <a href="/index.xml" aria-label="Subscribe to RSS feed"><img class="icon" alt="RSS Icon" width="16" height="16" src="{{ .Site.BaseURL }}/assets/fontawesome/rss-solid.svg" /></a>
+    key"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!
+    key-solid Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M282.3 343.7L248.1 376.1C244.5 381.5 238.4 384 232 384H192V424C192 437.3 181.3 448 168 448H128V488C128 501.3 117.3 512 104 512H24C10.75 512 0 501.3 0 488V408C0 401.6 2.529 395.5 7.029 391L168.3 229.7C162.9 212.8 160 194.7 160 176C160 78.8 238.8 0 336 0C433.2 0 512 78.8 512 176C512 273.2 433.2 352 336 352C317.3 352 299.2 349.1 282.3 343.7zM376 176C398.1 176 416 158.1 416 136C416 113.9 398.1 96 376 96C353.9 96 336 113.9 336 136C336 158.1 353.9 176 376 176z"/></svg></a>
+    <a href="https://github.com/ymherklotz" aria-label="View Github
+    profile"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--!
+    github-brands Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"/></svg></a>
+    <a href="https://sr.ht/~ymherklotz" aria-label="View Sourcehut
+    profile"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!
+    circle-regular Font Awesome Pro 6.1.1 by @fontawesome -
+    https://fontawesome.com License - https://fontawesome.com/license
+    (Commercial License) Copyright 2022 Fonticons, Inc. --><circle cx="255"
+    cy="255" r="230" stroke="currentColor" stroke-width="50" fill="none" /></svg></a>
+    <a rel="me" href="https://types.pl/@ymherklotz" aria-label="View Mastodon
+    profile"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--!
+    mastodon-brands Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M433 179.11c0-97.2-63.71-125.7-63.71-125.7-62.52-28.7-228.56-28.4-290.48 0 0 0-63.72 28.5-63.72 125.7 0 115.7-6.6 259.4 105.63 289.1 40.51 10.7 75.32 13 103.33 11.4 50.81-2.8 79.32-18.1 79.32-18.1l-1.7-36.9s-36.31 11.4-77.12 10.1c-40.41-1.4-83-4.4-89.63-54a102.54 102.54 0 0 1-.9-13.9c85.63 20.9 158.65 9.1 178.75 6.7 56.12-6.7 105-41.3 111.23-72.9 9.8-49.8 9-121.5 9-121.5zm-75.12 125.2h-46.63v-114.2c0-49.7-64-51.6-64 6.9v62.5h-46.33V197c0-58.5-64-56.6-64-6.9v114.2H90.19c0-122.1-5.2-147.9 18.41-175 25.9-28.9 79.82-30.8 103.83 6.1l11.6 19.5 11.6-19.5c24.11-37.1 78.12-34.8 103.83-6.1 23.71 27.3 18.4 53 18.4 175z"/></svg></a>
+    <a href="mailto:yann@yannherklotz.com" aria-label="Send me an
+    email"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!
+    envelope-solid Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M464 64C490.5 64 512 85.49 512 112C512 127.1 504.9 141.3 492.8 150.4L275.2 313.6C263.8 322.1 248.2 322.1 236.8 313.6L19.2 150.4C7.113 141.3 0 127.1 0 112C0 85.49 21.49 64 48 64H464zM217.6 339.2C240.4 356.3 271.6 356.3 294.4 339.2L512 176V384C512 419.3 483.3 448 448 448H64C28.65 448 0 419.3 0 384V176L217.6 339.2z"/></svg></a>
+    <a href="/index.xml" aria-label="Subscribe to RSS
+    feed"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--!
+    rss-solid Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M25.57 176.1C12.41 175.4 .9117 185.2 .0523 198.4s9.173 24.65 22.39 25.5c120.1 7.875 225.7 112.7 233.6 233.6C256.9 470.3 267.4 480 279.1 480c.5313 0 1.062-.0313 1.594-.0625c13.22-.8438 23.25-12.28 22.39-25.5C294.6 310.3 169.7 185.4 25.57 176.1zM32 32C14.33 32 0 46.31 0 64s14.33 32 32 32c194.1 0 352 157.9 352 352c0 17.69 14.33 32 32 32s32-14.31 32-32C448 218.6 261.4 32 32 32zM63.1 351.9C28.63 351.9 0 380.6 0 416s28.63 64 63.1 64s64.08-28.62 64.08-64S99.37 351.9 63.1 351.9z"/></svg></a>
   </p>
   <div class="generated-by">
     <p>&#169; 2016-2023 Yann Herklotz</p>
diff --git a/themes/ymherklotz/layouts/partials/head.html b/themes/ymherklotz/layouts/partials/head.html
index af383ed..298df07 100644
--- a/themes/ymherklotz/layouts/partials/head.html
+++ b/themes/ymherklotz/layouts/partials/head.html
@@ -21,8 +21,6 @@
   <link defer rel="stylesheet" href="{{ .Site.BaseURL }}/katex/katex.min.css">
   <script defer src="{{ .Site.BaseURL }}/katex/katex.min.js"></script>
   {{ end }}
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/syntax.css" />
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/syntax_dark.css" />
   <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/default.css" />
   {{ if .IsPage }}<link rel="stylesheet" href="{{ .Site.BaseURL }}/css/blog.css" />{{ end }}
 </head>
diff --git a/themes/ymherklotz/static/assets/fontawesome/circle-regular.svg b/themes/ymherklotz/static/assets/fontawesome/circle-regular.svg
index 81947ba..b9bce39 100644
--- a/themes/ymherklotz/static/assets/fontawesome/circle-regular.svg
+++ b/themes/ymherklotz/static/assets/fontawesome/circle-regular.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M512 256C512 397.4 397.4 512 256 512C114.6 512 0 397.4 0 256C0 114.6 114.6 0 256 0C397.4 0 512 114.6 512 256zM256 48C141.1 48 48 141.1 48 256C48 370.9 141.1 464 256 464C370.9 464 464 370.9 464 256C464 141.1 370.9 48 256 48z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M512 256C512 397.4 397.4 512 256 512C114.6 512 0 397.4 0 256C0 114.6 114.6 0 256 0C397.4 0 512 114.6 512 256zM256 48C141.1 48 48 141.1 48 256C48 370.9 141.1 464 256 464C370.9 464 464 370.9 464 256C464 141.1 370.9 48 256 48z"/></svg>
diff --git a/themes/ymherklotz/static/css/default.css b/themes/ymherklotz/static/css/default.css
index 89d942b..18c13ac 100644
--- a/themes/ymherklotz/static/css/default.css
+++ b/themes/ymherklotz/static/css/default.css
@@ -1,3 +1,6 @@
+@import url('./syntax.css');
+@import url('./syntax_dark.css') (prefers-color-scheme: dark);
+
 @font-face {
   font-family: 'Iosevka YMHG Web';
   font-display: swap;
@@ -35,7 +38,7 @@
 }
 
 body {
-  background-color: #fffff8;
+  background-color: #fbf7f0;
   color: #171d30;
 }
 
@@ -61,50 +64,42 @@ th {
   border-bottom: 0.1rem solid #60646b;
 }
 
-.codeblock {
-  background-color: #fdf6e3;
-}
-
 .post-meta {
   color: #505561;
 }
 
 h1:hover > .heading-anchor1, h2:hover > .heading-anchor2, h3:hover > .heading-anchor3, h4:hover > .heading-anchor4, h5:hover > .heading-anchor5, h6:hover > .heading-anchor6 { color: #00c266; }
 
-//.heading-anchor1, .heading-anchor2, .heading-anchor3, .heading-anchor4, .heading-anchor5, .heading-anchor6 { color: #fffff8; }
+//.heading-anchor1, .heading-anchor2, .heading-anchor3, .heading-anchor4, .heading-anchor5, .heading-anchor6 { color: #fbf7f0; }
 
 @media (prefers-color-scheme: dark) {
   body {
-    background-color: #171d30;
-    color: #fffff8;
+    background-color: #0d0e1c;
+    color: #fbf7f0;
   }
 
   a {
-    color: #fffff8;
+    color: #fbf7f0;
   }
 
   nav a, .logo a, .post-title a, .social a, .rightcolumn a, dt a {
-    color: #fffff8;
+    color: #fbf7f0;
   }
 
   .generated-by {
-    color: #fffff8;
+    color: #fbf7f0;
   }
 
   th {
-    color: #fffff8;
-    border-bottom: 0.1rem solid #fffff8;
-  }
-
-  .codeblock {
-    background-color: #1f2538;
+    color: #fbf7f0;
+    border-bottom: 0.1rem solid #fbf7f0;
   }
 
   .post-meta {
-    color: #fffff8;
+    color: #fbf7f0;
   }
 
-/*  .heading-anchor1, .heading-anchor2, .heading-anchor3, .heading-anchor4, .heading-anchor5, .heading-anchor6 { color: #171d30; }*/
+/*  .heading-anchor1, .heading-anchor2, .heading-anchor3, .heading-anchor4, .heading-anchor5, .heading-anchor6 { color: #0d0e1c; }*/
 }
 
 html {
@@ -195,6 +190,7 @@ pre {
   white-space: pre;
   overflow: auto;
   line-height: 1.3;
+  background-size: 0 1000px;
 }
 
 figcaption {
@@ -211,8 +207,8 @@ figcaption * {
 table {
   border-spacing: 0;
   width: 100%;
-  border-bottom: 0.15rem solid #171d30;
-  border-top: 0.15rem solid #171d30;
+  border-bottom: 0.15rem solid #0d0e1c;
+  border-top: 0.15rem solid #0d0e1c;
   margin: 30px 0;
 }
 
@@ -252,6 +248,13 @@ dl {
   text-align: center;
 }
 
+.social svg {
+  fill: currentColor;
+  height: 16px;
+  width: 16px;
+  margin: 0 2px;
+}
+
 /* article > p:first-of-type:first-letter { */
 /*   float: left; */
 /*   line-height: 1; */
-- 
cgit