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

fix: display proper custom logo in collabora #4104

Merged
merged 2 commits into from
Oct 11, 2024

Conversation

elzody
Copy link
Contributor

@elzody elzody commented Oct 8, 2024

  • Target version: main

Summary

this pull request makes it so that if you have a custom logo, it will properly display it within the collabora header bar. if you have only a custom logo, it will use that, but it will first use the custom header logo specifically if you have it set.

it was previously always defaulting to the general custom logo (one used on the login screen) no matter what, so this makes it a bit more dynamic.

TODO

  • merge matching pull request in collabora's online-branding repo here

Checklist

  • Code is properly formatted
  • Sign-off message is added to all commits
  • Documentation (manuals or wiki) has been updated or is not required

Signed-off-by: Elizabeth Danzberger <[email protected]>
Signed-off-by: Elizabeth Danzberger <[email protected]>
@elzody elzody added bug Something isn't working php Pull requests that update Php code javascript Pull requests that update Javascript code labels Oct 8, 2024
@elzody elzody self-assigned this Oct 8, 2024
@elzody elzody marked this pull request as ready for review October 8, 2024 19:58
@elzody
Copy link
Contributor Author

elzody commented Oct 11, 2024

/backport to stable30

@elzody
Copy link
Contributor Author

elzody commented Oct 11, 2024

/backport to stable29

@elzody
Copy link
Contributor Author

elzody commented Oct 11, 2024

/backport to stable28

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working javascript Pull requests that update Javascript code php Pull requests that update Php code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants