Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update Discord logo #29285

Merged
merged 4 commits into from
Feb 21, 2024
Merged

Update Discord logo #29285

merged 4 commits into from
Feb 21, 2024

Conversation

DanielMatiasCarvalho
Copy link
Contributor

Fixes #27057 by changing the discord .svg file and running make svg.

Before:

After:

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 20, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 20, 2024
@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 Feb 20, 2024
@silverwind silverwind added the backport/v1.21 This PR should be backported to Gitea 1.21 label Feb 20, 2024
@silverwind
Copy link
Member

Can try a backport, if the bot is smart enough to do it 😆.

delvh
delvh reviewed Feb 20, 2024
View reviewed changes
web_src/svg/gitea-discord.svg
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 127.14 96.36"><path fill="#5865f2" d="M107.7,8.07A105.15,105.15,0,0,0,81.47,0a72.06,72.06,0,0,0-3.36,6.83A97.68,97.68,0,0,0,49,6.83,72.37,72.37,0,0,0,45.64,0,105.89,105.89,0,0,0,19.39,8.09C2.79,32.65-1.71,56.6.54,80.21h0A105.73,105.73,0,0,0,32.71,96.36,77.7,77.7,0,0,0,39.6,85.25a68.42,68.42,0,0,1-10.85-5.18c.91-.66,1.8-1.34,2.66-2a75.57,75.57,0,0,0,64.32,0c.87.71,1.76,1.39,2.66,2a68.68,68.68,0,0,1-10.87,5.19,77,77,0,0,0,6.89,11.1A105.25,105.25,0,0,0,126.6,80.22h0C129.24,52.84,122.09,29.11,107.7,8.07ZM42.45,65.69C36.18,65.69,31,60,31,53s5-12.74,11.43-12.74S54,46,53.89,53,48.84,65.69,42.45,65.69Zm42.24,0C78.41,65.69,73.25,60,73.25,53s5-12.74,11.44-12.74S96.23,46,96.12,53,91.08,65.69,84.69,65.69Z"/></svg>
Copy link
Member

Choose a reason for hiding this comment

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

I think the class="svg gitea-discord" width="16" height="16" aria-hidden="true" should be kept

Copy link
Member

@silverwind silverwind Feb 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I don't see a need as the necessary attributes are added during the build process:

gitea/build/generate-svg.js

Lines 34 to 40 in 3f73eab

{name: 'prefixIds', params: {prefix: () => name}},
{name: 'addClassesToSVGElement', params: {classNames: ['svg', name]}},
{
name: 'addAttributesToSVGElement', params: {
attributes: [
{'xmlns': 'http://www.w3.org/2000/svg'},
{'width': '16'}, {'height': '16'}, {'aria-hidden': 'true'},

@delvh delvh changed the title Fix Issue#27057: Change discord .svg image Update Discord logo Feb 20, 2024
@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 Feb 21, 2024
@techknowlogick techknowlogick enabled auto-merge (squash) February 21, 2024 01:50
@techknowlogick techknowlogick merged commit 3d3c3d9 into go-gitea:main Feb 21, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Feb 21, 2024
@GiteaBot
Copy link
Contributor

I was unable to create a backport for 1.21. @DanielMatiasCarvalho, please send one manually. 🍵

go run ./contrib/backport 29285
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Feb 21, 2024
@silverwind silverwind removed the backport/manual No power to the bots! Create your backport yourself! label Feb 21, 2024
@GiteaBot
Copy link
Contributor

I was unable to create a backport for 1.21. @DanielMatiasCarvalho, please send one manually. 🍵

go run ./contrib/backport 29285
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Feb 21, 2024
@silverwind
Copy link
Member

No backport needed, but can be done manually on demand.

@wxiaoguang wxiaoguang removed backport/manual No power to the bots! Create your backport yourself! backport/v1.21 This PR should be backported to Gitea 1.21 labels Feb 21, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 22, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
cc8215a 
* giteaofficial/main: (32 commits)
  [skip ci] Updated translations via Crowdin
  Prevent double use of `git cat-file` session. (go-gitea#29298)
  Revert go-gitea#28753 because UI broken. (go-gitea#29293)
  Fix error display when merging PRs (go-gitea#29288)
  Refactor markup rendering to accept general "protocol:" prefix (go-gitea#29276)
  Remove jQuery from the installation page (go-gitea#29284)
  Always write proc-receive hook for all git versions (go-gitea#29287)
  Do not use `ctx.Doer` when reset password (go-gitea#29289)
  Update Discord logo (go-gitea#29285)
  [skip ci] Updated translations via Crowdin
  Remove jQuery .map() and enable eslint rules for it (go-gitea#29272)
  Explained where create issue/PR template (go-gitea#29035) (go-gitea#29266)
  Remove jQuery from repo wiki creation page (go-gitea#29271)
  Do not show delete button when time tracker is disabled (go-gitea#29257)
  Left align the input labels for the link account page (go-gitea#29255)
  [skip ci] Updated translations via Crowdin
  Remove jQuery from the repo migration form (go-gitea#29229)
  Fix content size does not match error when uploading lfs file (go-gitea#29259)
  Workaround to clean up old reviews on creating a new one (go-gitea#28554)
  Deduplicate translations for contributors graph (go-gitea#29256)
  ...
@github-actions GitHub Actions
Copy link

Automatically locked because of our CONTRIBUTING guidelines

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 29, 2024
@DanielMatiasCarvalho DanielMatiasCarvalho deleted the issue-27057 branch March 21, 2024 16:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh left review comments

@silverwind silverwind silverwind approved these changes

@a1012112796 a1012112796 a1012112796 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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Old icons for apps
7 participants
@DanielMatiasCarvalho @silverwind @GiteaBot @a1012112796 @delvh @techknowlogick @wxiaoguang