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(branding): properly send custom logo to collabora #3925

Merged
merged 1 commit into from
Aug 19, 2024

Conversation

elzody
Copy link
Contributor

@elzody elzody commented Aug 19, 2024

Summary

This PR properly formats the string which hands over the css values to the collabora frame. It was previously not accepting a ; at the end, invalidating the string and collabora couldn't read the --nc-custom-logo value properly. It seems to work better with string interpolation.

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 <lizzy7128@tutanota.de>
@elzody elzody added bug Something isn't working 3. to review Ready to be reviewed javascript Pull requests that update Javascript code branding regression labels Aug 19, 2024
@elzody elzody self-assigned this Aug 19, 2024
@elzody
Copy link
Contributor Author

elzody commented Aug 19, 2024

/backport to stable30

@elzody
Copy link
Contributor Author

elzody commented Aug 19, 2024

/backport to stable29

@elzody
Copy link
Contributor Author

elzody commented Aug 19, 2024

/backport to stable28

@elzody
Copy link
Contributor Author

elzody commented Aug 19, 2024

/backport to stable27

Copy link
Member

@juliushaertl juliushaertl left a comment

Choose a reason for hiding this comment

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

🙈

@elzody elzody merged commit 533ebf5 into main Aug 19, 2024
50 of 52 checks passed
@elzody elzody deleted the fix/collabora-custom-logo branch August 19, 2024 18:38

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Ready to be reviewed backport-request branding bug Something isn't working javascript Pull requests that update Javascript code regression
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Adding a logo in /settings/admin/theming does not change the logo in the Nextcloud Office Editor
2 participants