Reconcile first-paint logo rendering with a single cache-busted favicon source

Hop-State: A_06FN5A2J0W5SHTFGGJKVD10 Hop-Proposal: R_06FN5A0XSK27RAMA9V3MA88 Hop-Task: T_06FN50V05VH5V9WE9QQF9KR Hop-Attempt: AT_06FN59TV2SAYD23BXX9570G
2026-07-11 12:29:50 -07:00
parent f371490e28
commit d969133002
3 changed files with 49 additions and 5 deletions
@@ -10,10 +10,13 @@ fi

 docker compose --env-file "$env_file" up -d gitea
 docker compose --env-file "$env_file" exec -T -u root gitea \
-  mkdir -p /data/gitea/templates/custom /data/gitea/public/assets/js /data/gitea/public/assets/css /data/gitea/public/assets/img
+	mkdir -p /data/gitea/templates/base /data/gitea/templates/custom /data/gitea/public/assets/js /data/gitea/public/assets/css /data/gitea/public/assets/img
 docker compose --env-file "$env_file" cp \
-  deploy/gitea/templates/home.tmpl \
-  gitea:/data/gitea/templates/home.tmpl
+	deploy/gitea/templates/home.tmpl \
+	gitea:/data/gitea/templates/home.tmpl
+docker compose --env-file "$env_file" cp \
+	deploy/gitea/templates/base/head.tmpl \
+	gitea:/data/gitea/templates/base/head.tmpl
 docker compose --env-file "$env_file" cp \
 	deploy/gitea/templates/custom/header.tmpl \
 	gitea:/data/gitea/templates/custom/header.tmpl
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="{{ctx.Locale.Lang}}" data-theme="{{ctx.CurrentWebTheme.InternalName}}">
+<head>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<title>{{if .Title}}{{.Title}} - {{end}}{{.PageTitleCommon}}</title>
+	{{if .ManifestData}}<link rel="manifest" href="data:{{.ManifestData}}">{{end}}
+	<meta name="author" content="{{if .Repository}}{{.Owner.Name}}{{else}}{{MetaAuthor}}{{end}}">
+	<meta name="description" content="{{if .Repository}}{{.Repository.Name}}{{if .Repository.Description}} - {{.Repository.Description}}{{end}}{{else}}{{MetaDescription}}{{end}}">
+	<meta name="keywords" content="{{MetaKeywords}}">
+	<meta name="referrer" content="same-origin">{{/* required by: 1. "redirect_to" cookie; 2. cross-origin protection */}}
+{{if .GoGetImport}}
+	<meta name="go-import" content="{{.GoGetImport}} git {{.RepoCloneLink.HTTPS}}">
+	<meta name="go-source" content="{{.GoGetImport}} _ {{.GoDocDirectory}} {{.GoDocFile}}">
+{{end}}
+{{if and .EnableFeed .FeedURL}}
+	<link rel="alternate" type="application/atom+xml" title="" href="{{.FeedURL}}.atom">
+	<link rel="alternate" type="application/rss+xml" title="" href="{{.FeedURL}}.rss">
+{{end}}
+	<link rel="icon" href="{{AssetUrlPrefix}}/img/hop.svg?v=5" type="image/svg+xml">
+	<link rel="alternate icon" href="{{AssetUrlPrefix}}/img/favicon.png?v=5" type="image/png">
+	{{template "base/head_opengraph" .}}
+	{{template "base/head_style" .}}
+	{{template "base/head_script" .}}
+	{{template "custom/header" .}}
+</head>
+<body hx-swap="outerHTML" hx-ext="morph" hx-push-url="false">
+	{{template "custom/body_outer_pre" .}}
+
+	<div class="full height">
+		<noscript>{{ctx.Locale.Tr "enable_javascript"}}</noscript>
+
+		{{template "custom/body_inner_pre" .}}
+
+		{{if not .PageIsInstall}}
+			{{template "base/head_navbar" .}}
+		{{end}}
+
+{{if false}}
+	{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+	</div>
+</body>
+</html>
+{{end}}
@@ -1,4 +1,2 @@
 <link rel="stylesheet" href="{{AssetUrlPrefix}}/css/hop-home.css?v=4">
-<link rel="icon" href="{{AssetUrlPrefix}}/img/hop.svg?v=4" type="image/svg+xml">
-<link rel="alternate icon" href="{{AssetUrlPrefix}}/img/favicon.png?v=4" type="image/png">
 <script src="{{AssetUrlPrefix}}/js/hop-native.js?v=7"></script>