Add material icons for file list by wxiaoguang · Pull Request #33837 · go-gitea/gitea

wxiaoguang · 2025-03-09T17:25:45Z

This one should be good enough.

Doc: https://gitea.com/gitea/docs/pulls/181

wxiaoguang · 2025-03-09T17:25:56Z

Added material-icon-theme as a dev dependency, and generate the icons by our script.
The SVG icons are managed in a JSON file, it will be compressed when packing into the binary, so the size is acceptable (about 270KB).
Used some tricks to make the SVG icon work well for rendering, could be refactored in the future.

modules/fileicon/material.go

wxiaoguang · 2025-03-10T07:56:54Z

Let's merge and try it. If there is any problem, there are chances to revert or improve in following PRs.

wxiaoguang · 2025-03-10T12:35:06Z

Follow up fix: Fix material icon & diff highlight #33844

(cherry picked from commit 34e5df6)

delvh · 2025-03-10T20:44:16Z

Small question: What exactly changed since the last proposal by @yardenshoham?
I do think I remember concerns about resource usage and being "too colorful" which led to the original proposal being blocked.
Don't get me wrong, I'm absolutely in favor of finally having some more icons.
But what exactly is different now?

delvh · 2025-03-10T20:45:18Z

Okay, I just skimmed over the changes.
The answer seems to be that it incorporates exactly these points 👍

* giteaofficial/main: Fix various Fomantic UI and htmx problems (go-gitea#33851) Add workflow_job webhook (go-gitea#33694) Fix file icon mapping (go-gitea#33855) Drop fomantic build (go-gitea#33845) Fix auto concurrency cancellation skips commit status updates (go-gitea#33764) Fix test code (go-gitea#33829) Remove "noscript" tag from html head (go-gitea#33846) Fix material icon & diff highlight (go-gitea#33844) Fix LFS URL (go-gitea#33840) Add material icons for file list (go-gitea#33837)

lutinglt · 2025-03-14T13:03:08Z

templates/repo/view_list.tmpl

 				{{else}}
 					{{if $entry.IsDir}}
 						{{$subJumpablePathName := $entry.GetSubJumpablePathName}}
-						{{svg "octicon-file-directory-fill"}}


Have you considered not removing this identifier for compatibility with other icon plugins, such as Catppuccin for GitHub File Explorer Icons

TBH I don't know how these plugins work. And Gitea doesn't promise HTML layout / template compatibility between release. For example: before this PR, the "file list" has been heavily refactored in GitHub like repo home page #32213

If you have ideas about how to improve the layout and/or make plugins work, feel free to make some proposals/PRs.

Just read the plugin's code briefly.

If you mean that "we need to add a special CSS name for directories to make it could be query-selected by the plugin", I think we can add it in renderFileIconSVG function, it should be able to know whether the current entry is a dir or a file.

You can make changes as you like, or ignore this review

Sorry but I haven't got your point .....

Do you mean that it should keep octicon-file-directory-fill? Or it could output something like this?

<svg class="svg ... icontype-dir">for a directory</svg> <svg class="svg ...">for a file</svg>

?

Yes, my opinion is that there is no need to modify this class attribute

-> Add old svg class name to git entry icon #33884

Fix #33837 (comment)

MultiMote · 2025-05-16T09:56:15Z

Is the such colorful variant a good default option?

lunny · 2025-05-16T16:44:53Z

Is the such colorful variant a good default option?

~~It's not a default option. You need to change the icon theme in app.ini~~

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 9, 2025

pull-request-size bot added the size/XXL label Mar 9, 2025

github-actions bot added modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files modifies/dependencies modifies/frontend docs-update-needed The document needs to be updated synchronously labels Mar 9, 2025

wxiaoguang mentioned this pull request Mar 9, 2025

Add material icons for file list #26236

Closed

wxiaoguang force-pushed the custom-file-icon-2 branch from c1f191a to 318a317 Compare March 9, 2025 17:35

wxiaoguang added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Mar 9, 2025

wxiaoguang force-pushed the custom-file-icon-2 branch 2 times, most recently from 773ec63 to 7990e65 Compare March 9, 2025 18:02

wxiaoguang added this to the 1.24.0 milestone Mar 9, 2025

wxiaoguang force-pushed the custom-file-icon-2 branch 2 times, most recently from 12703f4 to e240070 Compare March 9, 2025 18:36

fix

b23f073

wxiaoguang force-pushed the custom-file-icon-2 branch from e240070 to b23f073 Compare March 9, 2025 18:38

yardenshoham reviewed Mar 9, 2025

View reviewed changes

modules/fileicon/material.go Show resolved Hide resolved

lunny approved these changes Mar 9, 2025

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 Mar 9, 2025

wxiaoguang added 2 commits March 10, 2025 06:41

Merge branch 'main' into custom-file-icon-2

66db26b

Merge branch 'main' into custom-file-icon-2

b2400ba

hiifong approved these changes Mar 10, 2025

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 Mar 10, 2025

yardenshoham approved these changes Mar 10, 2025

View reviewed changes

wxiaoguang merged commit 34e5df6 into go-gitea:main Mar 10, 2025
26 checks passed

wxiaoguang deleted the custom-file-icon-2 branch March 10, 2025 07:57

wxiaoguang mentioned this pull request Mar 10, 2025

[Feature] Show matching icons based on the file type #11149

Closed

lunny mentioned this pull request Mar 10, 2025

Allow custom file icons #32331

Closed

3 tasks

hiifong pushed a commit to hiifong/gitea that referenced this pull request Mar 10, 2025

Add material icons for file list (go-gitea#33837)

55f1605

(cherry picked from commit 34e5df6)

lutinglt reviewed Mar 14, 2025

View reviewed changes

wxiaoguang mentioned this pull request Mar 14, 2025

Add old svg class name to git entry icon #33884

Merged

wxiaoguang added a commit that referenced this pull request Mar 14, 2025

Add old svg class name to git entry icon (#33884)

0dfa94e

Fix #33837 (comment)

wxiaoguang mentioned this pull request Apr 8, 2025

Fix vertical centering of file tree icons and use entryIcon for submodules/symlinks #34137

Merged

go-gitea locked as resolved and limited conversation to collaborators May 16, 2025

Uh oh!

Comments

Conversation

wxiaoguang commented Mar 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wxiaoguang commented Mar 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

wxiaoguang commented Mar 10, 2025

Uh oh!

Uh oh!

wxiaoguang commented Mar 10, 2025

Uh oh!

delvh commented Mar 10, 2025

Uh oh!

delvh commented Mar 10, 2025

Uh oh!

lutinglt Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

wxiaoguang Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

wxiaoguang Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

lutinglt Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

wxiaoguang Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

lutinglt Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

wxiaoguang Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

MultiMote commented May 16, 2025

Uh oh!

lunny commented May 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

wxiaoguang commented Mar 9, 2025 •

edited

Loading

wxiaoguang commented Mar 9, 2025 •

edited

Loading

lunny commented May 16, 2025 •

edited

Loading