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

[stable24] fix: keep menubar in one line - prioritize entries #2313

Merged
merged 3 commits into from
Apr 19, 2022

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Apr 19, 2022

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #2294

Menubar entries with submenus cannot be moved to the more-button.
Prioritize them when picking the icons for the toolbar.
If they still do not fit - do not add them to the more button either
they do not work there.

This makes sure that the menubar fits in one line and does not overflow.

Still prioritizing `undo` and `bold` over `emoji` and `callout`.
The former ones are need fairly frequently while the latter not so often.
In addition mobile phones have an emoji picker in their text entry.

Signed-off-by: Max <max@nextcloud.com>
They cannot be shown in the menu with the remaining tools.

Signed-off-by: Max <max@nextcloud.com>
@mejo-
Copy link
Member

mejo- commented Apr 19, 2022

/compile amend

When resizing the browser make sure the three dot menu stays on the same line.
Without a buffer it would sometimes wrap
even though theoretical there was enough space in the menu bar.

No idea what is going on there - but a 4px buffer seems to prevent just that.

Signed-off-by: Max <max@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Copy link
Collaborator

@max-nextcloud max-nextcloud left a comment

Choose a reason for hiding this comment

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

Code changes all look good and seem to still apply fine in stable24.

@max-nextcloud
Copy link
Collaborator

@juliushaertl I think you're the only one with the power to merge this. static analysis is failing because dev-stable24 of https://packagist.org/packages/christophwurst/nextcloud has not been released and PR checks are failing because we're in RC times.

@juliusknorr
Copy link
Member

psalm shouldn't block the merge, seems drone is still required, though we dropped the CI parts from that. Let me adjust the branch protection rules.

@juliusknorr juliusknorr merged commit a104908 into stable24 Apr 19, 2022
@delete-merged-branch delete-merged-branch bot deleted the backport/2294/stable24 branch April 19, 2022 18:42
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.

3 participants