diff options
| author | silverwind <me@silverwind.io> | 2023-10-06 09:46:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-06 09:46:36 +0200 |
| commit | 023e937141dd891bce3370c869d4db2c60f971ed (patch) | |
| tree | 7b31acaf3c87e0d133ab14f6e29338233c717aa7 /templates | |
| parent | 04e88e6ca507448d46981cfb280211d2928fd517 (diff) | |
| download | gitea-023e937141dd891bce3370c869d4db2c60f971ed.tar.gz gitea-023e937141dd891bce3370c869d4db2c60f971ed.zip | |
Rename the default themes to gitea-light, gitea-dark, gitea-auto (#27419)
Part of https://github.com/go-gitea/gitea/issues/27097:
- `gitea` theme is renamed to `gitea-light`
- `arc-green` theme is renamed to `gitea-dark`
- `auto` theme is renamed to `gitea-auto`
I put both themes in separate CSS files, removing all colors from the
base CSS. Existing users will be migrated to the new theme names. The
dark theme recolor will follow in a separate PR.
## :warning: BREAKING :warning:
1. If there are existing custom themes with the names `gitea-light` or
`gitea-dark`, rename them before this upgrade and update the `theme`
column in the `user` table for each affected user.
2. The theme in `<html>` has moved from `class="theme-name"` to
`data-theme="name"`, existing customizations that depend on should be
updated.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Giteabot <teabot@gitea.io>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base/head.tmpl | 2 | ||||
| -rw-r--r-- | templates/base/head_style.tmpl | 8 | ||||
| -rw-r--r-- | templates/status/500.tmpl | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index c3645209cd..876b42d512 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="{{ctx.Locale.Lang}}" class="theme-{{if .SignedUser.Theme}}{{.SignedUser.Theme}}{{else}}{{DefaultTheme}}{{end}}"> +<html lang="{{ctx.Locale.Lang}}" data-theme="{{ThemeName .SignedUser}}"> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>{{if .Title}}{{.Title | RenderEmojiPlain}} - {{end}}{{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}}</title> diff --git a/templates/base/head_style.tmpl b/templates/base/head_style.tmpl index 7e8cba2aed..0793eaca20 100644 --- a/templates/base/head_style.tmpl +++ b/templates/base/head_style.tmpl @@ -1,8 +1,2 @@ <link rel="stylesheet" href="{{AssetUrlPrefix}}/css/index.css?v={{AssetVersion}}"> -{{if .IsSigned}} - {{if ne .SignedUser.Theme "gitea"}} - <link rel="stylesheet" href="{{AssetUrlPrefix}}/css/theme-{{.SignedUser.Theme | PathEscape}}.css?v={{AssetVersion}}"> - {{end}} -{{else if ne DefaultTheme "gitea"}} - <link rel="stylesheet" href="{{AssetUrlPrefix}}/css/theme-{{DefaultTheme | PathEscape}}.css?v={{AssetVersion}}"> -{{end}} +<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/theme-{{ThemeName .SignedUser | PathEscape}}.css?v={{AssetVersion}}"> diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl index 5488976da2..e5570bde73 100644 --- a/templates/status/500.tmpl +++ b/templates/status/500.tmpl @@ -1,12 +1,12 @@ {{/* This page should only depend the minimal template functions/variables, to avoid triggering new panics. -* base template functions: AppName, AssetUrlPrefix, AssetVersion, AppSubUrl, DefaultTheme, Str2html +* base template functions: AppName, AssetUrlPrefix, AssetVersion, AppSubUrl, ThemeName, Str2html * locale * Flash * ErrorMsg * SignedUser (optional) */}} <!DOCTYPE html> -<html lang="{{.locale.Lang}}" class="theme-{{if .SignedUser.Theme}}{{.SignedUser.Theme}}{{else}}{{DefaultTheme}}{{end}}"> +<html lang="{{.locale.Lang}}" data-theme="{{ThemeName .SignedUser}}"> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Internal Server Error - {{AppName}}</title> |