Update Discord logo #29285

DanielMatiasCarvalho · 2024-02-20T22:57:32Z

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

Before:

After:

silverwind · 2024-02-20T23:38:30Z

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

delvh · 2024-02-20T23:46:21Z

web_src/svg/gitea-discord.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid" viewBox="0 0 256 293" class="svg gitea-discord" width="16" height="16" aria-hidden="true"><path fill="#7289DA" d="M226.011 0H29.99C13.459 0 0 13.458 0 30.135v197.778c0 16.677 13.458 30.135 29.989 30.135h165.888l-7.754-27.063 18.725 17.408 17.7 16.384L256 292.571V30.135C256 13.458 242.542 0 226.011 0zm-56.466 191.05s-5.266-6.291-9.655-11.85c19.164-5.413 26.478-17.408 26.478-17.408-5.998 3.95-11.703 6.73-16.823 8.63-7.314 3.073-14.336 5.12-21.211 6.291-14.044 2.633-26.917 1.902-37.888-.146-8.339-1.61-15.507-3.95-21.504-6.29-3.365-1.317-7.022-2.926-10.68-4.974-.438-.293-.877-.439-1.316-.732a2.022 2.022 0 0 1-.585-.438c-2.633-1.463-4.096-2.487-4.096-2.487s7.022 11.703 25.6 17.261c-4.388 5.56-9.801 12.142-9.801 12.142-32.33-1.024-44.617-22.235-44.617-22.235 0-47.104 21.065-85.285 21.065-85.285 21.065-15.799 41.106-15.36 41.106-15.36l1.463 1.756C80.75 77.53 68.608 89.088 68.608 89.088s3.218-1.755 8.63-4.242c15.653-6.876 28.088-8.777 33.208-9.216.877-.147 1.609-.293 2.487-.293a123.776 123.776 0 0 1 29.55-.292c13.896 1.609 28.818 5.705 44.031 14.043 0 0-11.556-10.971-36.425-18.578l2.048-2.34s20.041-.44 41.106 15.36c0 0 21.066 38.18 21.066 85.284 0 0-12.435 21.211-44.764 22.235zm-68.023-68.316c-8.338 0-14.92 7.314-14.92 16.237 0 8.924 6.728 16.238 14.92 16.238 8.339 0 14.921-7.314 14.921-16.238.147-8.923-6.582-16.237-14.92-16.237m53.394 0c-8.339 0-14.922 7.314-14.922 16.237 0 8.924 6.73 16.238 14.922 16.238 8.338 0 14.92-7.314 14.92-16.238 0-8.923-6.582-16.237-14.92-16.237"/></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>


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

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'},

GiteaBot · 2024-02-21T01:55:29Z

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 · 2024-02-21T10:08:11Z

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

silverwind · 2024-02-21T10:16:43Z

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

* 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 · 2024-02-29T00:04:08Z

Automatically locked because of our CONTRIBUTING guidelines

Fix Issue#27057: Change discord .svg image

4fdad88

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 bot added the size/XS label Feb 20, 2024

github-actions bot added the modifies/frontend label Feb 20, 2024

Merge branch 'main' into issue-27057

17e82c7

silverwind approved these changes Feb 20, 2024

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 Feb 20, 2024

silverwind added the backport/v1.21 This PR should be backported to Gitea 1.21 label Feb 20, 2024

delvh reviewed Feb 20, 2024

View reviewed changes

delvh changed the title ~~Fix Issue#27057: Change discord .svg image~~ Update Discord logo Feb 20, 2024

a1012112796 approved these changes Feb 21, 2024

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 Feb 21, 2024

Merge branch 'main' into issue-27057

05296ad

techknowlogick enabled auto-merge (squash) February 21, 2024 01:50

Merge branch 'main' into issue-27057

19ac0a8

techknowlogick merged commit 3d3c3d9 into go-gitea:main Feb 21, 2024

GiteaBot added this to the 1.22.0 milestone Feb 21, 2024

GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Feb 21, 2024

silverwind removed the backport/manual No power to the bots! Create your backport yourself! label Feb 21, 2024

GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Feb 21, 2024

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

github-actions bot locked as resolved and limited conversation to collaborators Feb 29, 2024

DanielMatiasCarvalho deleted the issue-27057 branch March 21, 2024 16:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Update Discord logo #29285

Update Discord logo #29285

Uh oh!

DanielMatiasCarvalho commented Feb 20, 2024

Uh oh!

silverwind commented Feb 20, 2024

Uh oh!

delvh Feb 20, 2024

Uh oh!

silverwind Feb 21, 2024 •

edited

Loading

Uh oh!

GiteaBot commented Feb 21, 2024

Uh oh!

GiteaBot commented Feb 21, 2024

Uh oh!

silverwind commented Feb 21, 2024

Uh oh!

github-actions bot commented Feb 29, 2024

Uh oh!

Uh oh!

		@@ -1 +1 @@
		<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid" viewBox="0 0 256 293" class="svg gitea-discord" width="16" height="16" aria-hidden="true"><path fill="#7289DA" d="M226.011 0H29.99C13.459 0 0 13.458 0 30.135v197.778c0 16.677 13.458 30.135 29.989 30.135h165.888l-7.754-27.063 18.725 17.408 17.7 16.384L256 292.571V30.135C256 13.458 242.542 0 226.011 0zm-56.466 191.05s-5.266-6.291-9.655-11.85c19.164-5.413 26.478-17.408 26.478-17.408-5.998 3.95-11.703 6.73-16.823 8.63-7.314 3.073-14.336 5.12-21.211 6.291-14.044 2.633-26.917 1.902-37.888-.146-8.339-1.61-15.507-3.95-21.504-6.29-3.365-1.317-7.022-2.926-10.68-4.974-.438-.293-.877-.439-1.316-.732a2.022 2.022 0 0 1-.585-.438c-2.633-1.463-4.096-2.487-4.096-2.487s7.022 11.703 25.6 17.261c-4.388 5.56-9.801 12.142-9.801 12.142-32.33-1.024-44.617-22.235-44.617-22.235 0-47.104 21.065-85.285 21.065-85.285 21.065-15.799 41.106-15.36 41.106-15.36l1.463 1.756C80.75 77.53 68.608 89.088 68.608 89.088s3.218-1.755 8.63-4.242c15.653-6.876 28.088-8.777 33.208-9.216.877-.147 1.609-.293 2.487-.293a123.776 123.776 0 0 1 29.55-.292c13.896 1.609 28.818 5.705 44.031 14.043 0 0-11.556-10.971-36.425-18.578l2.048-2.34s20.041-.44 41.106 15.36c0 0 21.066 38.18 21.066 85.284 0 0-12.435 21.211-44.764 22.235zm-68.023-68.316c-8.338 0-14.92 7.314-14.92 16.237 0 8.924 6.728 16.238 14.92 16.238 8.339 0 14.921-7.314 14.921-16.238.147-8.923-6.582-16.237-14.92-16.237m53.394 0c-8.339 0-14.922 7.314-14.922 16.237 0 8.924 6.73 16.238 14.922 16.238 8.338 0 14.92-7.314 14.92-16.238 0-8.923-6.582-16.237-14.92-16.237"/></svg> No newline at end of file
		<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> No newline at end of file

	{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'},

Uh oh!

Update Discord logo #29285

Update Discord logo #29285

Uh oh!

Conversation

DanielMatiasCarvalho commented Feb 20, 2024

Uh oh!

silverwind commented Feb 20, 2024

Uh oh!

delvh Feb 20, 2024

Choose a reason for hiding this comment

Uh oh!

silverwind Feb 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GiteaBot commented Feb 21, 2024

Uh oh!

GiteaBot commented Feb 21, 2024

Uh oh!

silverwind commented Feb 21, 2024

Uh oh!

github-actions bot commented Feb 29, 2024

Uh oh!

Uh oh!

silverwind Feb 21, 2024 •

edited

Loading