-
-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Improve theme display #30671
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Improve theme display #30671
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
cbb63bc
fix
wxiaoguang 0b9bfc9
remove PreferColorSchemes and add comments
wxiaoguang c9053c7
Merge branch 'main' into theme-meta-info
wxiaoguang d941875
document
wxiaoguang fdfd440
update doc, add tests
wxiaoguang 40fd4b3
fix typo
wxiaoguang e3d10b2
Merge branch 'main' into theme-meta-info
wxiaoguang ece200b
Merge branch 'main' into theme-meta-info
GiteaBot 73512d5
Merge branch 'main' into theme-meta-info
GiteaBot 13fff1a
Merge branch 'main' into theme-meta-info
GiteaBot 1e6b081
Merge branch 'main' into theme-meta-info
wxiaoguang 4f9f956
fix missing theme meta info
wxiaoguang 458edae
Merge branch 'main' into theme-meta-info
wxiaoguang a59d4a5
Merge branch 'main' into theme-meta-info
GiteaBot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
// Copyright 2024 The Gitea Authors. All rights reserved. | ||
// SPDX-License-Identifier: MIT | ||
|
||
package webtheme | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func TestParseThemeMetaInfo(t *testing.T) { | ||
m := parseThemeMetaInfoToMap(`gitea-theme-meta-info { | ||
--k1: "v1"; | ||
--k2: "v\"2"; | ||
--k3: 'v3'; | ||
--k4: 'v\'4'; | ||
--k5: v5; | ||
}`) | ||
assert.Equal(t, map[string]string{ | ||
"--k1": "v1", | ||
"--k2": `v"2`, | ||
"--k3": "v3", | ||
"--k4": "v'4", | ||
"--k5": "v5", | ||
}, m) | ||
|
||
// if an auto theme imports others, the meta info should be extracted from the last one | ||
// the meta in imported themes should be ignored to avoid incorrect overriding | ||
m = parseThemeMetaInfoToMap(` | ||
@media (prefers-color-scheme: dark) { gitea-theme-meta-info { --k1: foo; } } | ||
@media (prefers-color-scheme: light) { gitea-theme-meta-info { --k1: bar; } } | ||
gitea-theme-meta-info { | ||
--k2: real; | ||
}`) | ||
assert.Equal(t, map[string]string{"--k2": "real"}, m) | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
web_src/css/themes/theme-gitea-auto-protanopia-deuteranopia.css
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,6 @@ | ||
@import "./theme-gitea-light-protanopia-deuteranopia.css" (prefers-color-scheme: light); | ||
@import "./theme-gitea-dark-protanopia-deuteranopia.css" (prefers-color-scheme: dark); | ||
|
||
gitea-theme-meta-info { | ||
--theme-display-name: "Auto (Red/Green Colorblind-friendly)"; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,6 @@ | ||
@import "./theme-gitea-light.css" (prefers-color-scheme: light); | ||
@import "./theme-gitea-dark.css" (prefers-color-scheme: dark); | ||
|
||
gitea-theme-meta-info { | ||
--theme-display-name: "Auto"; | ||
} | ||
wxiaoguang marked this conversation as resolved.
Show resolved
Hide resolved
|
4 changes: 4 additions & 0 deletions
4
web_src/css/themes/theme-gitea-dark-protanopia-deuteranopia.css
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
web_src/css/themes/theme-gitea-light-protanopia-deuteranopia.css
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.