Rename the default themes to gitea-light, gitea-dark, gitea-auto #27419

silverwind · 2023-10-03T21:59:00Z

Part of #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.

⚠️ BREAKING ⚠️

If there are existing custom themes with the names gitea-light, gitea-dark or gitea-auto, rename them before this upgrade and update the theme column in the user table for each affected user.
The theme name in the <html> tag has moved from class="theme-name" to data-theme="name", existing customizations that depend on the previous class need to be updated.
If your configuration sets one of the previous themes as ui.DEFAULT_THEME, you need to update to the new values.

silverwind · 2023-10-03T22:37:53Z

user is a reserved word in postgres (where it should be escaped as "user") and mssql (where it should be escaped as [user]). Does xorm handle this kind of escaping correctly when using backticks? I've seen these backticks in use in a number of other migrations, so I assume xorm abstracts this escaping.

lunny · 2023-10-04T01:26:54Z

user is a reserved word in postgres (where it should be escaped as "user") and mssql (where it should be escaped as [user]). Does xorm handle this kind of escaping correctly when using backticks? I've seen these backticks in use in a number of other migrations, so I assume xorm abstracts this escaping.

Yes, xorm will convert `word` according to different databases.

delvh · 2023-10-04T06:46:02Z

Hmm… I'd like to wait with this PR until 1.21.0 has been released.
Otherwise, backports mostly won't be possible anymore.

silverwind · 2023-10-04T09:29:43Z

Otherwise, backports mostly won't be possible anymore.

Which backports? Only backports that have CSS variable changes will present merge conflicts that are easily resolved.

caesar · 2023-10-04T16:13:23Z

Should the auto theme also be renamed to gitea-auto?

silverwind · 2023-10-04T16:38:53Z

I guess we could, I like such consistency. Or we go the other way and name them auto,light,dark.

denyskon · 2023-10-04T17:11:38Z

I think gitea-* is better to indicate that these are our official themes

* origin/main: When comparing with an non-exist repository, return 404 but 500 (go-gitea#27437) Fix pr template (go-gitea#27436) Use minimal required version on CI and remove unnecessary services (go-gitea#27429) Fix missing `ctx` in new_form.tmpl (go-gitea#27434) Use flex-container for repo and org settings (go-gitea#27418) Fix yet another `ctx` template bug (go-gitea#27417) Add Index to `action.user_id` (go-gitea#27403) [skip ci] Updated translations via Crowdin

silverwind · 2023-10-04T22:57:29Z

One more change added: The theme name was previously on HTML class="theme-<name>", and has moved to data-theme="<name>". This was unused since the introduction of --is-dark-theme CSS variable, but I still find it good to retain under this new dedicated attribute for customization. I added a breaking note for it.

modules/templates/helper.go

templates/base/head_style.tmpl

Co-authored-by: Lunny Xiao <[email protected]>

modules/templates/helper.go

wxiaoguang · 2023-10-06T08:08:51Z

templates/status/500.tmpl

 * 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}}">


What is the data-theme used for? Especially in the 500 template.

Not used at all by our first-party code, but it's useful to have imho, if only for customization. Previously the class was used at one point in time for Monaco, but that has been replaced by --is-dark-theme.

* giteaoffical/main: (79 commits) Pre-register OAuth application for tea (go-gitea#27509) Fix mermaid flowchart margin issue (go-gitea#27503) add a shortcut to user's profile page to admin user details (go-gitea#27299) Fix actionlint (go-gitea#27513) [skip ci] Updated translations via Crowdin Update JS and PY dependencies (go-gitea#27501) Improve feed icons and feed merge text color (go-gitea#27498) Downgrade `go-co-op/gocron` to v1.31.1 (go-gitea#27511) Enable markdownlint `no-duplicate-header` (go-gitea#27500) bump go-deps (go-gitea#27489) Apply to became a maintainer (go-gitea#27491) change runner for binary [skip ci] Updated translations via Crowdin Remove .exe suffix when cross-compiling on Windows (go-gitea#27448) move re-useable workflow add checkout to disk-clean use hosted runners for nightly actions (go-gitea#27485) Avoid run change title process when the title is same (go-gitea#27467) Fix panic in storageHandler (go-gitea#27446) Rename the default themes to gitea-light, gitea-dark, gitea-auto (go-gitea#27419) ...

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 3, 2023

pull-request-size bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 3, 2023

github-actions bot added type/docs This PR mainly updates/creates documentation topic/ui Change the appearance of the Gitea UI labels Oct 3, 2023

silverwind added this to the 1.22.0 milestone Oct 3, 2023

silverwind force-pushed the lightdark branch from 7d6b0fe to f41607d Compare October 3, 2023 22:03

Rename the default themes to gitea-light and gitea-dark

6972daa

silverwind force-pushed the lightdark branch from f41607d to 6972daa Compare October 3, 2023 22:09

silverwind added 4 commits October 4, 2023 00:11

update comments

22d5539

remove unnecessary imports

ad15442

fmt

8236639

quote postgres reserved name 'user'

7d054ad

silverwind added 2 commits October 4, 2023 00:41

quote everything

35b7f19

change comment

f4a07f3

GiteaBot added the pr/breaking Merging this PR means builds will break. Needs a description what exactly breaks, and how to fix it! label Oct 4, 2023

lunny approved these changes Oct 4, 2023

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Oct 4, 2023

denyskon approved these changes Oct 4, 2023

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 4, 2023

silverwind added 2 commits October 4, 2023 23:28

add changes

fa0ec53

silverwind added 2 commits October 5, 2023 00:38

format

ad21ba1

move theme name to data-theme

c2eff82

fix ThemeName when nil is passed

913b659

silverwind commented Oct 5, 2023

View reviewed changes

modules/templates/helper.go Outdated Show resolved Hide resolved

lunny reviewed Oct 5, 2023

View reviewed changes

modules/templates/helper.go Outdated Show resolved Hide resolved

lunny reviewed Oct 5, 2023

View reviewed changes

templates/base/head_style.tmpl Outdated Show resolved Hide resolved

Update modules/templates/helper.go

9f4e6c7

Co-authored-by: Lunny Xiao <[email protected]>

silverwind commented Oct 5, 2023

View reviewed changes

modules/templates/helper.go Outdated Show resolved Hide resolved

silverwind added 6 commits October 5, 2023 15:24

Update modules/templates/helper.go

d8e0f14

fix syntax

4073392

pass in user into ThemeName

5ff07a9

remove useless PathEscape, go does it fine

dbb6ae8

PathEscape still needed for slashes

f6917af

fmt

b97ab34

lunny approved these changes Oct 6, 2023

View reviewed changes

lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 6, 2023

GiteaBot added 3 commits October 6, 2023 10:46

Merge branch 'main' into lightdark

c727920

Merge branch 'main' into lightdark

26b4cc0

Merge branch 'main' into lightdark

818d9db

silverwind merged commit 023e937 into go-gitea:main Oct 6, 2023
25 checks passed

GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 6, 2023

silverwind deleted the lightdark branch October 6, 2023 07:46

wxiaoguang reviewed Oct 6, 2023

View reviewed changes

GiteaBot added the kind/breaking label Oct 7, 2023

delvh removed the kind/breaking label Oct 7, 2023

GiteaBot added the kind/breaking label Oct 7, 2023

silverwind mentioned this pull request Oct 9, 2023

NEW UI IS BROKEN #27537

Closed

go-gitea locked as resolved and limited conversation to collaborators Jan 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename the default themes to gitea-light, gitea-dark, gitea-auto #27419

Rename the default themes to gitea-light, gitea-dark, gitea-auto #27419

silverwind commented Oct 3, 2023 •

edited

Loading

silverwind commented Oct 3, 2023 •

edited

Loading

lunny commented Oct 4, 2023 •

edited

Loading

delvh commented Oct 4, 2023

silverwind commented Oct 4, 2023

caesar commented Oct 4, 2023

silverwind commented Oct 4, 2023 •

edited

Loading

denyskon commented Oct 4, 2023

silverwind commented Oct 4, 2023 •

edited

Loading

wxiaoguang Oct 6, 2023

silverwind Oct 6, 2023 •

edited

Loading

Rename the default themes to gitea-light, gitea-dark, gitea-auto #27419

Rename the default themes to gitea-light, gitea-dark, gitea-auto #27419

Conversation

silverwind commented Oct 3, 2023 • edited Loading

⚠️ BREAKING ⚠️

silverwind commented Oct 3, 2023 • edited Loading

lunny commented Oct 4, 2023 • edited Loading

delvh commented Oct 4, 2023

silverwind commented Oct 4, 2023

caesar commented Oct 4, 2023

silverwind commented Oct 4, 2023 • edited Loading

denyskon commented Oct 4, 2023

silverwind commented Oct 4, 2023 • edited Loading

wxiaoguang Oct 6, 2023

Choose a reason for hiding this comment

silverwind Oct 6, 2023 • edited Loading

Choose a reason for hiding this comment

silverwind commented Oct 3, 2023 •

edited

Loading

silverwind commented Oct 3, 2023 •

edited

Loading

lunny commented Oct 4, 2023 •

edited

Loading

silverwind commented Oct 4, 2023 •

edited

Loading

silverwind commented Oct 4, 2023 •

edited

Loading

silverwind Oct 6, 2023 •

edited

Loading