Fixing footer 'generated by', using JetBrains web font, adjusting code font size

css/_code.sass

@@ -1,6 +1,7 @@
 code
   color: $color-em-text
-  font-family: "JetBrains Mono", "Source Code Pro", "Courier New", monospace
+  font-family: $code-font-family
+  font-size: $code-font-size
   font-variant-ligatures: none
   white-space: pre-wrap
   word-wrap: break-word

css/_default.sass

@@ -10,14 +10,13 @@ html
   margin: 0
   padding: 0
   background-color: $color-greenfield
-  font-family: $font-family
-  font-size: 90%
+  font-family: $text-font-family
+  font-size: $text-font-size
   font-variant: discretionary-ligatures
 
 body
   margin: 0
   padding: 0
-  font-size: 1rem
   color: $color-text
   background-color: $bg-content
   overflow: scroll
@@ -26,12 +25,11 @@ body
     @include body-block
     border-top: 0.7rem solid $border-color
     border-bottom: $border-very-thick solid $border-color
-    // background-color: $bg-greenfield
 
     > nav
       font-size: 0
       > a
-        font-size: $font-size-nav
+        font-size: $text-font-size
         display: inline-block
         line-height: 1.2em
         & + a
@@ -46,7 +44,6 @@ nav
 
 footer
   @include body-block
-  // background-color: $bg-greenfield
   border-bottom: 0.7rem solid $border-color
   border-top: $border-very-thick solid $border-color
   padding-bottom: 3em
@@ -69,7 +66,7 @@ h1, h2, h3, h4, h5, h6
   color: $color-em-text
 
 h1
-  font-size: 1.8rem
+  font-size: 2rem
 
 h2
   font-size: 1.6rem

css/_theme.sass

@@ -1,4 +1,9 @@
-$font-family: "Freight Text", "Georgia", serif
+@import "fonts/code"
+
+$text-font-family: "Georgia", serif
+$text-font-size: 1rem
+$code-font-family: "JetBrains Mono", monospace
+$code-font-size: 85% // because JetBrains Mono runs a bit big
 
 $color-greenfield: darkgreen
 $color-text: darkslategray
@@ -17,8 +22,6 @@ $border-color: change-color($color-greenfield, $green: 80%)
 // $border-color-sides: change-color($border-color, $lightness: 30%)
 $border-color-sides: change-color($color-greenfield, $green: 80%)
 
-$font-size-nav: 1rem
-
 @mixin body-block
   margin: 0
   padding: 1rem

css/fonts/_code.sass

@@ -0,0 +1,55 @@
+@font-face
+  font-family: 'JetBrains Mono'
+  src: url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Bold-Italic.woff2') format('woff2'), url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-Bold-Italic.woff') format('woff')
+  font-weight: 700
+  font-style: italic
+  font-display: swap
+
+@font-face
+  font-family: 'JetBrains Mono'
+  src: url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Bold.woff2') format('woff2'), url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-Bold.woff') format('woff')
+  font-weight: 700
+  font-style: normal
+  font-display: swap
+
+@font-face
+  font-family: 'JetBrains Mono'
+  src: url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-ExtraBold-Italic.woff2') format('woff2'), url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-ExtraBold-Italic.woff') format('woff')
+  font-weight: 800
+  font-style: italic
+  font-display: swap
+
+@font-face
+  font-family: 'JetBrains Mono'
+  src: url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-ExtraBold.woff2') format('woff2'), url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-ExtraBold.woff') format('woff')
+  font-weight: 800
+  font-style: normal
+  font-display: swap
+
+@font-face
+  font-family: 'JetBrains Mono'
+  src: url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Italic.woff2') format('woff2'), url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-Italic.woff') format('woff')
+  font-weight: 400
+  font-style: italic
+  font-display: swap
+
+@font-face
+  font-family: 'JetBrains Mono'
+  src: url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Medium-Italic.woff2') format('woff2'), url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-Medium-Italic.woff') format('woff')
+  font-weight: 500
+  font-style: italic
+  font-display: swap
+
+@font-face
+  font-family: 'JetBrains Mono'
+  src: url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Medium.woff2') format('woff2'), url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-Medium.woff') format('woff')
+  font-weight: 500
+  font-style: normal
+  font-display: swap
+
+@font-face
+  font-family: 'JetBrains Mono'
+  src: url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff2/JetBrainsMono-Regular.woff2') format('woff2'), url('https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono/web/woff/JetBrainsMono-Regular.woff') format('woff')
+  font-weight: 400
+  font-style: normal
+  font-display: swap

partials/footer.html

@@ -1,5 +1,14 @@
 <footer>
   <p class="copyright">Logan McGrath &copy; <span class="copyright-date">2012</span></p>
-  $partial("partials/source-generated.html")$
-  <p class="generated-by-hakyll">Site proudly generated by <a href="http://jaspervdj.be/hakyll">Hakyll</a>.</p>
+  <p class="generated-by-hakyll">
+    Site proudly generated by <a href="http://jaspervdj.be/hakyll">Hakyll</a> from commit
+    <a class="commit-link" href="$githubUrl$/commit/$gitSha1$">[$gitSha1$] $gitMessage$</a>$if(isChanged)$ with local changes$endif$.
+  </p>
+  <p class="generated-by-hakyll">
+  $if(isGenerated)$
+    This page was rendered by processing data from other pages.
+  $else$
+    This page was rendered from <a href="$githubUrl$/blob/$gitSha1$/$path$">$path$</a>
+  $endif$
+  </p>
 </footer>

partials/source-generated.html

@@ -1,13 +1,27 @@
-<p class="generated-from">
+<p class="source-generated">
+  This page was generated from commit
+  <a class="commit-link" href="$githubUrl$/commit/$gitSha1$">[$gitSha1$] $gitMessage$</a>
+  $if(isChanged)$
+    with local changes
+  $endif$
+</p>
+$if(isGenerated)$
+$else$
+<p class="source-generated">
+  The source for this page may be found at <a href="$githubUrl$/blob/$gitSha1$/$path$">$path$</a>
+</p>
+$endif$
+
+<!-- <p class="generated-from">
   This page was generated
     $if(isGenerated)$
       from commit
     $else$
-      from file <code><a href="$githubUrl$/blob/$gitSha1$/$path$">$path$</a></code>
+      from file <a href="$githubUrl$/blob/$gitSha1$/$path$">$path$</a>
       at commit
     $endif$
-  <a class="commit-link" href="$githubUrl$/commit/$gitSha1$">[$gitSha1$] $gitMessage$</a>
+  Log: <a class="commit-link" href="$githubUrl$/commit/$gitSha1$">[$gitSha1$] $gitMessage$</a>
   $if(isChanged)$
     with local modifications
   $endif$
-</p>
+</p> -->