From 7a080df6bb31604643c1645da83f7b093a8cef75 Mon Sep 17 00:00:00 2001
From: Johan Brook <johan@lookback.io>
Date: Mon, 18 Sep 2023 23:36:09 +0200
Subject: [PATCH] More tweaks, messed up with root ems

---
 src/_includes/layouts/home.njk |  2 +-
 src/_includes/nav-main.njk     |  2 +-
 src/css/base.css               |  2 +-
 src/css/fonts.css              | 35 ----------------------------------
 src/css/variables.css          | 16 +++++-----------
 src/johan.css                  |  1 -
 src/mind.njk                   |  4 ++--
 7 files changed, 10 insertions(+), 52 deletions(-)
 delete mode 100644 src/css/fonts.css

diff --git a/src/_includes/layouts/home.njk b/src/_includes/layouts/home.njk
index d82add52b..9961e50c5 100644
--- a/src/_includes/layouts/home.njk
+++ b/src/_includes/layouts/home.njk
@@ -25,7 +25,7 @@ home: true
             <h2 class="font-sans f5 fw4 mb3">
               <a href="{{ note.data.permalink() | url }}" class="muted">Latest: {{ note.data.date | date("PPP — HH:mm")}}</a>
             </h2>
-            <div class="prose font-mono f5">
+            <div class="prose font-mono f6">
               {{ note.data.content | excerpt | md | safe }}
             </div>
 
diff --git a/src/_includes/nav-main.njk b/src/_includes/nav-main.njk
index d36c4e849..eb9961c2b 100644
--- a/src/_includes/nav-main.njk
+++ b/src/_includes/nav-main.njk
@@ -1,6 +1,6 @@
 <nav role="navigation" class="MainNav">
 	<div class="sticky">
-		<h1 class="f3 sr-only-mobile">
+		<h1 class="f4 sr-only-mobile">
 			<a href="/" aria-label="Home">
 				<span>Johan Brook</span><span aria-hidden="true" class="BackLink ml2">←</span>
 			</a>
diff --git a/src/css/base.css b/src/css/base.css
index 730bd9323..523a60cbc 100644
--- a/src/css/base.css
+++ b/src/css/base.css
@@ -8,7 +8,7 @@ html {
 	text-size-adjust: none;
 }
 
-body {
+:where(body, html) {
 	font: normal calc(var(--font-size-base) * 1px) / var(--leading) var(--serif);
 	background-color: var(--color-bg);
 	color: var(--color-text);
diff --git a/src/css/fonts.css b/src/css/fonts.css
deleted file mode 100644
index 0e92f7d97..000000000
--- a/src/css/fonts.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Inter */
-
-@font-face {
-	font-family: 'Inter var';
-	font-weight: 100 900;
-	font-display: var(--font-strategy);
-	font-style: normal;
-	font-named-instance: 'Regular';
-	src: url("/assets/fonts/inter/Inter-roman.var.woff2") format("woff2");
-}
-
-@font-face {
-	font-family: 'Inter var';
-	font-weight: 100 900;
-	font-display: var(--font-strategy);
-	font-style: italic;
-	font-named-instance: 'Italic';
-	src: url("/assets/fonts/inter/Inter-italic.var.woff2") format("woff2");
-}
-
-/* JetBrains Mono */
-
-@font-face {
-	font-family: 'JetBrains Mono';
-	font-weight: normal;
-	font-display: var(--font-strategy);
-	src: url('/assets/fonts/jetbrains-mono/JetBrainsMono-Regular.woff2') format("woff2");
-}
-
-@font-face {
-	font-family: 'JetBrains Mono';
-	font-weight: bold;
-	font-display: var(--font-strategy);
-	src: url('/assets/fonts/jetbrains-mono/JetBrainsMono-Bold.woff2') format("woff2");
-}
diff --git a/src/css/variables.css b/src/css/variables.css
index da96d4d50..0780af764 100644
--- a/src/css/variables.css
+++ b/src/css/variables.css
@@ -80,21 +80,15 @@
 	--tracking-f5: -0.009em;
 	--tracking-f6: -0.0025em;
 
-	--font-size-headline: 6rem;
-	--font-size-subheadline: 5rem;
-
-	--f0: calc((82 / var(--font-size-base)) * 1rem);
-	--f1: calc((30 / var(--font-size-base)) * 1rem);
-	--f2: calc((26 / var(--font-size-base)) * 1rem);
-	--f3: calc((20 / var(--font-size-base)) * 1rem);
-	--f4: calc((17 / var(--font-size-base)) * 1rem);
+	--f0: calc((72 / var(--font-size-base)) * 1rem);
+	--f1: calc((36 / var(--font-size-base)) * 1rem);
+	--f2: calc((30 / var(--font-size-base)) * 1rem);
+	--f3: calc((26 / var(--font-size-base)) * 1rem);
+	--f4: 1rem;
 	--f5: calc((15 / var(--font-size-base)) * 1rem);
 	--f6: calc((13 / var(--font-size-base)) * 1rem);
 	--f7: calc((11 / var(--font-size-base)) * 1rem);
 
-	/* See https://developers.google.com/web/updates/2016/02/font-display */
-	--font-strategy: fallback;
-
 	/* Measures */
 
 	--inset: calc(var(--lineheight) / 2);
diff --git a/src/johan.css b/src/johan.css
index 62394fc43..5e70678b1 100644
--- a/src/johan.css
+++ b/src/johan.css
@@ -12,7 +12,6 @@ components,
 utils;
 
 @import 'css/reset.css' layer(setup);
-@import 'css/fonts.css' layer(setup);
 @import 'css/variables.css' layer(setup);
 
 @import 'css/base.css' layer(base);
diff --git a/src/mind.njk b/src/mind.njk
index 5e386eece..2e3b26601 100644
--- a/src/mind.njk
+++ b/src/mind.njk
@@ -15,10 +15,10 @@ menu:
       <li>
         <article id="{{ post.data.date | date("NUMERIC") }}">
         	<header class="mb2">
-	            <h1 class="f3 no-rhythm mb0">
+	            <h1 class="f4 no-rhythm mb0">
 	              <a href="#{{ post.data.date | date("NUMERIC") }}" title="Permalink" class="font-serif no-underline target">{{ post.data.date | date("PPP — HH:mm") }} <span>#</span></a>
 	            </h1>
-            {% if post.data.location %}<p title="Posted from" class="muted font-sans mb0 f4 target">{{ post.data.location }}</p>{% endif %}
+            {% if post.data.location %}<p title="Posted from" class="muted font-sans mb0 f5 target">{{ post.data.location }}</p>{% endif %}
           </header>
 
           <div class="prose">