From 1df7fe4652ecdea59a729e48e568f80c1f353d4c Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami@samhuri.net>
Date: Tue, 14 Feb 2023 21:21:40 -0800
Subject: [PATCH] Bring safe-area CSS up to speed and fix theme-color

---
 public/css/style.css                                        | 6 +++---
 .../Sources/samhuri.net/Site/Templates/SiteTemplate.swift   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index f5c31b8..b41c8eb 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -38,7 +38,7 @@ body {
   margin: 0 auto;
   max-width: 48rem;
   width: 90%;
-  padding: 0 constant(safe-area-inset-right) 0 constant(safe-area-inset-left);
+  padding: 0 env(safe-area-inset-right) 0 env(safe-area-inset-left);
 }
 
 @media (min-width: 40rem) {
@@ -105,7 +105,7 @@ body {
   color: #222;
   font-family: 'museo-sans', 'Helvetica Neue', 'Verdana', 'Roboto', sans-serif;
   font-display: swap;
-  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
 }
 
 h1,
@@ -140,7 +140,7 @@ hr {
 header.primary {
   background-color: #151515;
   color: #f7f7f7;
-  padding: 0.8rem 1.2rem;
+  padding: 0.8rem max(1.2rem, env(safe-area-inset-right)) 0.8rem max(1.2rem, env(safe-area-inset-left));
   border-bottom: solid 1px #888888;
   box-shadow: 0 0 12px 2px #222;
 }
diff --git a/samhuri.net/Sources/samhuri.net/Site/Templates/SiteTemplate.swift b/samhuri.net/Sources/samhuri.net/Site/Templates/SiteTemplate.swift
index df77362..5b0060c 100644
--- a/samhuri.net/Sources/samhuri.net/Site/Templates/SiteTemplate.swift
+++ b/samhuri.net/Sources/samhuri.net/Site/Templates/SiteTemplate.swift
@@ -15,7 +15,6 @@ enum Template {
             .comment("meow"),
             .head(
                 .encoding(.utf8),
-                .viewport(.accordingToDevice),
                 .title(context.title),
                 .siteName(context.site.title),
                 .url(context.site.url),
@@ -28,7 +27,8 @@ enum Template {
                 .safariPinnedTabIcon(context.imageURL("safari-pinned-tab.svg"), color: "#aa0000"),
                 .link(.attribute(named: "rel", value: "manifest"), .href(context.imageURL("manifest.json"))),
                 .meta(.name("msapplication-config"), .content(context.imageURL("browserconfig.xml").absoluteString)),
-                .meta(.name("theme-color"), .content("#ffffff")),
+                .meta(.name("theme-color"), .content("#121212")), // matches header
+                .meta(.name("viewport"), .content("width=device-width, initial-scale=1.0, viewport-fit=cover")),
                 .link(.rel(.dnsPrefetch), .href("https://use.typekit.net")),
                 .link(.rel(.dnsPrefetch), .href("https://netdna.bootstrapcdn.com")),
                 .link(.rel(.dnsPrefetch), .href("https://gist.github.com")),