Skip to content

Keep file tree view icons consistent with icon theme#33921

Merged
lunny merged 25 commits intogo-gitea:mainfrom
kerwin612:optimize-filetree-icons-match
Apr 6, 2025
Merged

Keep file tree view icons consistent with icon theme#33921
lunny merged 25 commits intogo-gitea:mainfrom
kerwin612:optimize-filetree-icons-match

Conversation

@kerwin612
Copy link
Copy Markdown
Member

@kerwin612 kerwin612 commented Mar 17, 2025 •
edited by lunny
Loading

Fix #33914

before:
3000-gogitea-gitea-y4ulxr46c4k ws-us118 gitpod io_test_test gitea_src_branch_main_ gitmodules

after:
3000-gogitea-gitea-y4ulxr46c4k ws-us118 gitpod io_test_test gitea_src_branch_main_README md

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 17, 2025
@pull-request-size pull-request-size Bot added size/L and removed size/M labels Mar 18, 2025
@kerwin612
Copy link
Copy Markdown
Member Author

kerwin612 commented Mar 18, 2025

file diff

before:
3000-gogitea-gitea-y4ulxr46c4k ws-us118 gitpod io_test_test_compare_main test_diff_fileicon (1)

after:
3000-gogitea-gitea-y4ulxr46c4k ws-us118 gitpod io_test_test_compare_main test_diff_fileicon

@lutinglt
Copy link
Copy Markdown
Contributor

lutinglt commented Mar 18, 2025

Perhaps it would be better to use Material Icons for the folder as well?
The Material Icons for GitHub browser plugin follows this logic

image

@lunny lunny changed the title Optimize File Icons in file-tree to Match Those in file-list Optimize File Icons in file-tree to Match Those in file-list and also in file-tree in pull request changed files. Mar 18, 2025
@lunny lunny changed the title Optimize File Icons in file-tree to Match Those in file-list and also in file-tree in pull request changed files. Optimize file icons in file-tree to match those in file-list and also in file-tree of pull request changed files. Mar 18, 2025
@kerwin612
Copy link
Copy Markdown
Member Author

kerwin612 commented Mar 19, 2025

Perhaps it would be better to use Material Icons for the folder as well? The Material Icons for GitHub browser plugin follows this logic

This commit [888296b] is aimed at unifying the icons of folders on the UI.

before:
image

image

after:
image
image

@lunny lunny added this to the 1.24.0 milestone Mar 19, 2025
@lunny lunny added type/bug topic/ui Change the appearance of the Gitea UI skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Mar 19, 2025
@delvh delvh changed the title Optimize file icons in file-tree to match those in file-list and also in file-tree of pull request changed files. Also show file-specific icons in the PR file tree Mar 19, 2025
wxiaoguang
wxiaoguang reviewed Mar 19, 2025
View reviewed changes
Comment thread services/repository/files/tree_test.go Outdated
wxiaoguang
wxiaoguang reviewed Mar 19, 2025
View reviewed changes
Comment thread templates/repo/view_list.tmpl Outdated
wxiaoguang
wxiaoguang reviewed Mar 19, 2025
View reviewed changes
Comment thread routers/web/repo/treelist.go Outdated
@kerwin612 kerwin612 requested a review from wxiaoguang March 21, 2025 01:52
@lunny lunny changed the title Also show file-specific icons in the PR file tree Keep file tree view icons consistent with icon theme Mar 31, 2025
@GiteaBot 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 31, 2025
wxiaoguang
wxiaoguang previously requested changes Mar 31, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need more time to address some design problems like #33921 (comment)

@GiteaBot GiteaBot added lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 31, 2025
@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Apr 6, 2025

I have made some improvements to the framework design. Some details could be fine-tuned based on the new design.

@wxiaoguang wxiaoguang dismissed their stale review April 6, 2025 06:24

dismiss

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged labels Apr 6, 2025
@wxiaoguang wxiaoguang force-pushed the optimize-filetree-icons-match branch from 865a4a8 to 473a3f1 Compare April 6, 2025 06:38
wxiaoguang
wxiaoguang approved these changes Apr 6, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's fine to me to leave these TODOs to the future.

@GiteaBot 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 Apr 6, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 6, 2025
@lunny lunny enabled auto-merge (squash) April 6, 2025 19:10
@lunny lunny merged commit 8c9d2bd into go-gitea:main Apr 6, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 6, 2025
@wxiaoguang wxiaoguang deleted the optimize-filetree-icons-match branch April 6, 2025 22:50
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 8, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
97a5712 
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  docs: add Chinese translations for README files (go-gitea#34132)
  Keep file tree view icons consistent with icon theme (go-gitea#33921)
  Make markdown render match GitHub's behavior (go-gitea#34129)
  Remove dead code: RepoRef (go-gitea#34131)
  Correctly handle submodule view and avoid throwing 500 error (go-gitea#34121)
  Use `overflow-wrap: anywhere` to replace `word-break: break-all` (go-gitea#34126)
  Fix markdown render behaviors (go-gitea#34122)
  Refactor dropdown ellipsis (go-gitea#34123)
  Avoid creating unnecessary temporary cat file sub process (go-gitea#33942)
  Fix discord webhook 400 status code when description limit is exceeded (go-gitea#34084)
  Refactor markup render to fix various path problems (go-gitea#34114)
  [skip ci] Updated translations via Crowdin
  Fix invalid version in RPM package path (go-gitea#34112)
  also check default ssh-cert location for host (go-gitea#34099) (go-gitea#34100)
  Fix markdown frontmatter rendering (go-gitea#34102)
  Get changed files based on merge base when checking `pull_request` actions trigger (go-gitea#34106)
  Add `last_committer_date` and `last_author_date` for file contents API (go-gitea#32921)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 6, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@lunny lunny lunny approved these changes

@lafriks lafriks lafriks approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

Assignees

No one assigned

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. topic/ui Change the appearance of the Gitea UI type/bug

Projects

None yet

Milestone

1.24.0

Development

Successfully merging this pull request may close these issues.

Add icons to the sidebar of the file list and diff list

6 participants

@kerwin612 @lutinglt @wxiaoguang @lunny @lafriks @GiteaBot