From b570643cc5807f2ffadc7966a0180efdc4475836 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Wed, 20 Mar 2024 17:57:03 +0100
Subject: Two-story g in headings

---
 src/components/landing/Subtitle.module.css          |  1 +
 src/components/landing/sections/Contact.module.css  |  2 +-
 src/components/landing/sections/Research.module.css |  2 +-
 src/css/custom.css                                  | 16 +++++++---------
 4 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/components/landing/Subtitle.module.css b/src/components/landing/Subtitle.module.css
index bb00e22..e680092 100644
--- a/src/components/landing/Subtitle.module.css
+++ b/src/components/landing/Subtitle.module.css
@@ -6,6 +6,7 @@
 
 .subtitle {
   --ifm-h3-font-size: 1.5rem;
+  --casl: 1;
   letter-spacing: var(--marussy-heading-tracking);
   margin: 1.5rem 0;
 }
diff --git a/src/components/landing/sections/Contact.module.css b/src/components/landing/sections/Contact.module.css
index 15ed2a6..cfe1455 100644
--- a/src/components/landing/sections/Contact.module.css
+++ b/src/components/landing/sections/Contact.module.css
@@ -93,7 +93,7 @@
 
 .contact__title {
   margin: 0;
-  --casl: 0;
+  --casl: 0.5;
 }
 
 .contact__value {
diff --git a/src/components/landing/sections/Research.module.css b/src/components/landing/sections/Research.module.css
index aa4cf1c..bfbc37a 100644
--- a/src/components/landing/sections/Research.module.css
+++ b/src/components/landing/sections/Research.module.css
@@ -65,7 +65,7 @@
 .topic__title {
   margin-top: 1rem;
   text-align: center;
-  --casl: 0;
+  --casl: 0.5;
 }
 
 .topic__description {
diff --git a/src/css/custom.css b/src/css/custom.css
index 6907041..82aa56e 100644
--- a/src/css/custom.css
+++ b/src/css/custom.css
@@ -57,11 +57,12 @@
     'slnt' var(--slnt),
     'CRSV' var(--crsv) !important;
   font-feature-settings:
-    'ss02',
-    /* Use single-story g everywhere. */ 'ss05' var(--mono),
-    /* Simplified l in code. */ 'ss10' var(--mono),
-    /* Dotted zero in code. */ 'ss12' var(--mono),
-    /* Simplified @ in code. */ 'titl' var(--casl),
+    'ss02' calc(1 - min(var(--casl) * 1000, 1)),
+    /* Use single-story g. */ 'ss05' calc(1 - min((1 - var(--mono)) * 1000, 1)),
+    /* Simplified l in code. */ 'ss10'
+      calc(1 - min((1 - var(--mono)) * 1000, 1)),
+    /* Dotted zero in code. */ 'ss12' calc(1 - min((1 - var(--mono)) * 1000, 1)),
+    /* Simplified @ in code. */ 'titl' calc(min(var(--casl) * 1000, 1)),
     /* No descender for Q in titles. */ 'liga' !important; /* Enable italic ligatures. */
 }
 
@@ -80,10 +81,6 @@ kbd {
 
 h1,
 h2,
-h3,
-h4,
-h5,
-h6,
 .button {
   --casl: 1;
 }
@@ -95,6 +92,7 @@ h2 {
 
 h3,
 .button--lg {
+  --casl: 0.5;
   letter-spacing: var(--marussy-heading-tracking-looser);
 }
 
-- 
cgit v1.2.3-54-g00ecf