Remove meta tags theme-color and default-theme (#24960)

As discussed in #24953 (comment). ## ⚠️ BREAKING ⚠️ 1. The `ui.THEME_COLOR_META_TAG` setting has been removed. If you still need to set the `theme-color` meta tag, add it via `$GITEA_CUSTOM/templates/custom/header.tmpl` instead. 2. The non-standard `default-theme` meta-tag added in #13809 has been removed. Third party code that needs to obtain the currently loaded theme should use the `theme-<name>` class on the `<html>` node instead, which reflect the currently active theme.
go-gitea · May 28, 2023 · c7612d1 · c7612d1
1 parent faf8557
commit c7612d1
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 15 deletions.
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
@@ -1180,10 +1180,6 @@ LEVEL = Info
 ;; Number of line of codes shown for a code comment
 ;CODE_COMMENT_LINES = 4
 ;;
-;; Value of `theme-color` meta tag, used by some mobile browers for chrome and
-;; out-of-viewport areas. Default is unset which uses body color.
-;THEME_COLOR_META_TAG =
-;;
 ;; Max size of files to be displayed (default is 8MiB)
 ;MAX_DISPLAY_FILE_SIZE = 8388608
 ;;

diff --git a/docs/content/doc/administration/config-cheat-sheet.en-us.md b/docs/content/doc/administration/config-cheat-sheet.en-us.md
@@ -221,7 +221,6 @@ The following configuration set `Content-Type: application/vnd.android.package-a
 - `SHOW_USER_EMAIL`: **true**: Whether the email of the user should be shown in the Explore Users page.
 - `THEMES`:  **auto,gitea,arc-green**: All available themes. Allow users select personalized themes.
   regardless of the value of `DEFAULT_THEME`.
-- `THEME_COLOR_META_TAG`: **\<empty\>**: Value of `theme-color` meta tag, used by some mobile browsers for chrome and out-of-viewport areas. Default is unset which uses body color.
 - `MAX_DISPLAY_FILE_SIZE`: **8388608**: Max size of files to be displayed (default is 8MiB)
 - `REACTIONS`: All available reactions users can choose on issues/prs and comments
     Values can be emoji alias (:smile:) or a unicode emoji.

diff --git a/modules/setting/ui.go b/modules/setting/ui.go
@@ -22,7 +22,6 @@ var UI = struct {
 	GraphMaxCommitNum     int
 	CodeCommentLines      int
 	ReactionMaxUserNum    int
-	ThemeColorMetaTag     string
 	MaxDisplayFileSize    int64
 	ShowUserEmail         bool
 	DefaultShowFullName   bool
@@ -77,7 +76,6 @@ var UI = struct {
 	GraphMaxCommitNum:   100,
 	CodeCommentLines:    4,
 	ReactionMaxUserNum:  10,
-	ThemeColorMetaTag:   ``,
 	MaxDisplayFileSize:  8388608,
 	DefaultTheme:        `auto`,
 	Themes:              []string{`auto`, `gitea`, `arc-green`},

diff --git a/modules/templates/helper.go b/modules/templates/helper.go
@@ -118,9 +118,6 @@ func NewFuncMap() template.FuncMap {
 		"CustomEmojis": func() map[string]string {
 			return setting.UI.CustomEmojisMap
 		},
-		"ThemeColorMetaTag": func() string {
-			return setting.UI.ThemeColorMetaTag
-		},
 		"MetaAuthor": func() string {
 			return setting.UI.Meta.Author
 		},

diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
@@ -4,8 +4,6 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>{{if .Title}}{{.Title | RenderEmojiPlain}} - {{end}}{{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}}</title>
 	{{if .ManifestData}}<link rel="manifest" href="data:{{.ManifestData}}">{{end}}
-	{{if ThemeColorMetaTag}}<meta name="theme-color" content="{{ThemeColorMetaTag}}">{{end}}
-	<meta name="default-theme" content="{{DefaultTheme}}">
 	<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}}">
@@ -63,7 +61,7 @@
 	<meta property="og:description" content="{{MetaDescription}}">
 {{end}}
 	<meta property="og:site_name" content="{{AppName}}">
-	{{template "base/stylesheets" .}}
+	{{template "base/head_style" .}}
 	{{template "custom/header" .}}
 </head>
 <body>

diff --git a/templates/base/stylesheets.tmpl → templates/base/head_style.tmpl b/templates/base/stylesheets.tmpl → templates/base/head_style.tmpl
diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl
@@ -11,7 +11,7 @@
 	<title>Internal Server Error - {{AppName}}</title>
 	<link rel="icon" href="{{AssetUrlPrefix}}/img/favicon.svg" type="image/svg+xml">
 	<link rel="alternate icon" href="{{AssetUrlPrefix}}/img/favicon.png" type="image/png">
-	{{template "base/stylesheets" .}}
+	{{template "base/head_style" .}}
 </head>
 <body>
 	<div class="full height">
@@ -28,7 +28,7 @@
 		<div role="main" class="page-content status-page-500">
 			<p class="gt-mt-5 center"><img src="{{AssetUrlPrefix}}/img/500.png" alt="Internal Server Error"></p>
 			<div class="ui divider"></div>
-			<div class="ui container gt-mt-5">
+			<div class="ui container gt-my-5">
 				{{if .ErrorMsg}}
 					<p>{{.locale.Tr "error.occurred"}}:</p>
 					<pre class="gt-whitespace-pre-wrap gt-break-all">{{.ErrorMsg}}</pre>