Skip to content

Improve feed icons and feed merge text color#27498

Merged
silverwind merged 5 commits intogo-gitea:mainfrom
silverwind:feed1
Oct 7, 2023
Merged

Improve feed icons and feed merge text color#27498
silverwind merged 5 commits intogo-gitea:mainfrom
silverwind:feed1

Conversation

@silverwind
Copy link
Member

@silverwind silverwind commented Oct 7, 2023 •
edited
Loading

  1. Improve various feed icons
  2. Fix merge message color
image image

Fixes: #27495
Continues: #27356

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 7, 2023
@silverwind silverwind added the type/enhancement An improvement of existing functionality label Oct 7, 2023
@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 Oct 7, 2023
@lunny lunny added this to the 1.22.0 milestone Oct 7, 2023
delvh
delvh approved these changes Oct 7, 2023
View reviewed changes
modules/templates/util_misc.go
return "diff"
case activities_model.ActionPublishRelease:
return "file-diff"
case activities_model.ActionPublishRelease, activities_model.ActionPushTag, activities_model.ActionDeleteTag:
Copy link
Member

@delvh delvh Oct 7, 2023

Choose a reason for hiding this comment

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

Optimally, there would be a tag deleted icon, but I think if anything, we have to suggest that upstream.

Copy link
Member Author

@silverwind silverwind Oct 7, 2023

Choose a reason for hiding this comment

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

Same could be said about branch deletion. Not sure if it would be accepted upstream.

Copy link
Member

@delvh delvh Oct 7, 2023

Choose a reason for hiding this comment

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

I mean… I don't know why it shouldn't.
The only reasoning I can see is that no one has the time to implement it, but apart from that there's nothing speaking against it as it is needed.

Copy link
Member

@delvh delvh Oct 7, 2023

Choose a reason for hiding this comment

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

Oh.
grafik

Copy link
Member Author

@silverwind silverwind Oct 7, 2023

Choose a reason for hiding this comment

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

They will accept a resonably articulated feedback type issue I assume.

Copy link

@Andre601 Andre601 Oct 7, 2023

Choose a reason for hiding this comment

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

Just to add to this, they do... Once gave feedback on the site and they implemented it eventually... Tho, it can take a long time to be implemented (And I recall using bug report, but I assume the feedback one may work as well)

@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 Oct 7, 2023
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 7, 2023
@silverwind silverwind enabled auto-merge (squash) October 7, 2023 13:51
@silverwind silverwind merged commit 3b139fa into go-gitea:main Oct 7, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 7, 2023
@silverwind silverwind deleted the feed1 branch October 7, 2023 23:35
zjjhot added a commit to zjjhot/gitea that referenced this pull request Oct 8, 2023
@zjjhot
Merge remote-tracking branch 'giteaoffical/main'
8b59533 
* 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 pushed a commit to GiteaBot/gitea that referenced this pull request Oct 21, 2023
@silverwind @GiteaBot
Improve feed icons and feed merge text color (go-gitea#27498)
e34bb32 
1. Improve various feed icons
2. Fix merge message color


<img width="763" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/3f5bcb23-6d90-4c63-85f2-46bd7e1c96d6">
<img width="769" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/466c37b4-e2f4-42bb-922d-b86596cdc6d0">


Fixes: go-gitea#27495
Continues: go-gitea#27356
@GiteaBot GiteaBot mentioned this pull request Oct 21, 2023
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Oct 21, 2023
silverwind added a commit that referenced this pull request Oct 21, 2023
@GiteaBot @silverwind
Improve feed icons and feed merge text color (#27498) (#27716)
8885108 
Backport #27498 by @silverwind

1. Improve various feed icons
2. Fix merge message color


<img width="763" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/3f5bcb23-6d90-4c63-85f2-46bd7e1c96d6">
<img width="769" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/466c37b4-e2f4-42bb-922d-b86596cdc6d0">


Fixes: #27495
Continues: #27356

Co-authored-by: silverwind <me@silverwind.io>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jan 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@delvh delvh delvh approved these changes

@lunny lunny lunny approved these changes

+1 more reviewer

@Andre601 Andre601 Andre601 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/enhancement An improvement of existing functionality

Projects

None yet

Milestone

1.22.0

Development

Successfully merging this pull request may close these issues.

"PR closed" event uses "check-circle" icon rather than "git-pull-request-closed" icon for closed and unmerged PRs

6 participants

@silverwind @lunny @Andre601 @delvh @GiteaBot @denyskon