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.

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

Allow admins to configure instance favicon and logo #30040

Merged
merged 14 commits into from May 6, 2024

Conversation

FawazFarid
Copy link
Contributor

@FawazFarid FawazFarid commented Apr 23, 2024

At the moment, admins can not use a custom favicon or app icon for their instances.

This PR enables them to do so by going to "Administration > Server settings > Branding", select an app icon and an image file (WEBP, PNG, GIF or JPG).

If those files uploaded they will be used by the instance, otherwise, the default mastodon icons are used.

Screenshots

Screenshot 2024-04-30 at 9 50 09 PM

What? I'm a Linkin Park fan 🤷🏻‍♂️ ....In the End, it doesn't even matter what I use.

Screenshot 2024-04-30 at 10 14 29 PM

Related Issue(s)

#29987
#7396

app/lib/icon_generator.rb Outdated Show resolved Hide resolved
Copy link
Contributor

This pull request has merge conflicts that must be resolved before it can be merged.

@FawazFarid FawazFarid marked this pull request as ready for review April 30, 2024 19:24
Copy link
Contributor

This pull request has resolved merge conflicts and is ready for review.

@FawazFarid FawazFarid requested review from renchap and Gargron May 1, 2024 11:42
@renchap renchap requested a review from a team May 2, 2024 21:29
@renchap renchap added this to the 4.3.0 milestone May 2, 2024
ClearlyClaire
ClearlyClaire previously approved these changes May 3, 2024
Copy link
Contributor

@ClearlyClaire ClearlyClaire left a comment

Choose a reason for hiding this comment

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

Looks good to me! Maybe those settings should be in “Branding” rather than “Appearance” in server settings, but I don't have a strong opinion about it.

@renchap renchap linked an issue May 3, 2024 that may be closed by this pull request
@FawazFarid
Copy link
Contributor Author

FawazFarid commented May 4, 2024

@ClearlyClaire I agree with favicons and app icons being more of a “Branding” thing rather than “Appearance”. Making this change now

cc-ing @renchap for visibility

@Gargron Gargron added this pull request to the merge queue May 6, 2024
Merged via the queue into mastodon:main with commit bc24c47 May 6, 2024
28 checks passed
@FawazFarid FawazFarid deleted the config-instance-favicon-and-logo branch May 8, 2024 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow admins to configure instance favicon and logo
4 participants