From abe58e8dabffdf3c721bf23fe701764f49d547c3 Mon Sep 17 00:00:00 2001
From: clover caruso <git@paperclover.net>
Date: Mon, 5 Jan 2026 20:33:28 -0800
Subject: [PATCH] fix: font cors hell situation

---
 config/Caddyfile                              | 13 ++++++++----
 config/jellyfin/Caddyfile                     | 21 +------------------
 .../theme/login/resources/css/styles.css      |  7 +++++++
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/config/Caddyfile b/config/Caddyfile
index efff157865ebe703bc0bb68c75015e222256a872..f14578dcfcae18d5aa07020b4a479d2795b4d54b 100644
--- a/config/Caddyfile
+++ b/config/Caddyfile
@@ -59,6 +59,9 @@
 
 # services are sorted alphabetically
 auth.{$HOME_DOMAIN} {
+  handle / {
+    redir / /realms/master/account
+  }
 	reverse_proxy "http://keycloak"
 }
 dawarich.{$HOME_DOMAIN} {
@@ -70,11 +73,13 @@ db.{$HOME_DOMAIN} {
 file.{$HOME_DOMAIN} {
   handle "/.static/*" {
     uri strip_prefix /.static
+    @cors header_regexp origin Origin ^https://.*\.(paperclover\.net|local\.test)$
+    header @cors {
+      Access-Control-Allow-Origin "{http.request.header.Origin}"
+      Access-Control-Allow-Methods "GET, OPTIONS"
+      Access-Control-Allow-Headers "Range"
+    }
     root /etc/caddy/static
-    @cors header_regexp origin Origin ^([a-f0-9]+)\.(paperclover\.net|local\.test)$
-    header @cors Access-Control-Allow-Origin "{http.request.header.Origin}"
-    header @cors Access-Control-Allow-Methods "GET, OPTIONS"
-    header @cors Access-Control-Allow-Headers "Range"
     file_server
   }
   import auth-optional "http://copyparty"
diff --git a/config/jellyfin/Caddyfile b/config/jellyfin/Caddyfile
index c4048cb73d420d2f4ecf668bbd60af1d5958544f..a45dd36e88597489cb841c20a3460fa227d332ec 100644
--- a/config/jellyfin/Caddyfile
+++ b/config/jellyfin/Caddyfile
@@ -5,24 +5,10 @@ jelly.{$HOME_DOMAIN} {
 			body `
 			@import url("/original{http.request.uri.path}") layer(base);
 			@import url("/original/web/themes/dark/theme.css") layer(basetheme);
+			@import url("https://file.paperclover.net/.static/font.css") layer(fnt);
 			@import url("https://jellyfin.catppuccin.com/theme.css") layer(cat);
 			@import url("https://jellyfin.catppuccin.com/catppuccin-macchiato.css");
 			@import url("https://jellyfin.catppuccin.com/catppuccin-latte.css") (prefers-color-scheme: light);
-			@font-face {
-			font-family: 'Name Sans';
-			src: url('/web/extra/font/ATNameSansVariable-Regular.woff2') format('woff2') tech(variations);
-			font-weight: 100 900;
-			font-style: normal;
-			font-display: swap;
-			font-stretch: 75% 125%;}
-
-			@font-face {
-			font-family: 'Name Sans';
-			src: url('/web/extra/font/ATNameSansVariable-Italic.woff2') format('woff2') tech(variations);
-			font-weight: 100 900;
-			font-style: italic;
-			font-display: swap;
-			font-stretch: 75% 125%;}
 
 			body { font-family: "Name Sans", sans-serif;}
 			.preload, .touch-menu-la, .mainDrawer-scrollContainer {
@@ -72,11 +58,6 @@ jelly.{$HOME_DOMAIN} {
 		uri strip_prefix /original
 		reverse_proxy "jellyfin:8096"
 	}
-	handle_path /web/extra/font/* {
-		uri strip_prefix /web/extra/font
-		root /etc/caddy/font
-		file_server
-	}
 	handle_path /web/extra/* {
 		uri strip_prefix /web/extra
 		root /etc/caddy/jellyfin
diff --git a/config/keycloak/theme/login/resources/css/styles.css b/config/keycloak/theme/login/resources/css/styles.css
index 21b5932129de7e04f441d70bec4edd1d2dfacd4e..a83eba74bb0480ff51395cb16960598688bc835b 100644
--- a/config/keycloak/theme/login/resources/css/styles.css
+++ b/config/keycloak/theme/login/resources/css/styles.css
@@ -151,6 +151,9 @@ button {
 .pf-v5-c-form__group input:not([type="checkbox"]) {
   width: 100%;
 }
+.pf-v5-c-form__group > div:first-child {
+  display: flex;
+}
 .pf-v5-c-form__label {
   margin-bottom: 0.25rem;
   text-transform: lowercase;
@@ -333,3 +336,7 @@ input[type="text"] + [data-password-toggle] i {
 #credit a:not(:hover) {
   opacity: 0.5;
 }
+
+.subtitle:has(.subtitle .required) {
+  display: none;
+}
-- 
2.54.0