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.

Sign up for GitHub

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

Jump to bottom

Conflict resolution screen with different width #3950

Closed
max-nextcloud opened this issue Mar 16, 2023 · 0 comments · Fixed by #3951
Closed

Conflict resolution screen with different width #3950

max-nextcloud opened this issue Mar 16, 2023 · 0 comments · Fixed by #3951
Labels
bug Something isn't working

Comments

@max-nextcloud
Copy link
Collaborator

Describe the bug
It's hard to check if two files are the same if the conflict screen shows both at different width

To Reproduce
Steps to reproduce the behavior:

  1. Create a conflict
  2. Check the width

Expected behavior
The two versions should share the available screen space halve and halve.

Screenshots
grafik

Client details:

  • OS: ubuntu
  • Browser: ff
  • Version: 26 rc 2
  • Device: desktop

Seen on cloud.nextcloud.com
@max-nextcloud max-nextcloud added the bug Something isn't working label Mar 16, 2023
max-nextcloud added a commit that referenced this issue Mar 16, 2023
@max-nextcloud
fix: split layout of conflict view
15068eb 
Give both versions 50% of the screen space and try to vertically align them.
This should make comparing the versions easier.

Fixes #3950.

Signed-off-by: Max <max@nextcloud.com>
@max-nextcloud max-nextcloud mentioned this issue Mar 16, 2023
Merged
4 tasks
max-nextcloud added a commit that referenced this issue Mar 16, 2023
@max-nextcloud
fix: split layout of conflict view
0ca0ee5 
Give both versions 50% of the screen space and try to vertically align them.
This should make comparing the versions easier.

Fixes #3950.

Signed-off-by: Max <max@nextcloud.com>
mejo- pushed a commit that referenced this issue Mar 16, 2023
@max-nextcloud @mejo-
fix: split layout of conflict view
e83f2db 
Give both versions 50% of the screen space and try to vertically align them.
This should make comparing the versions easier.

Fixes #3950.

Signed-off-by: Max <max@nextcloud.com>
backportbot-nextcloud bot pushed a commit that referenced this issue Mar 17, 2023
@max-nextcloud @backportbot-nextcloud
fix: split layout of conflict view
349161a 
Give both versions 50% of the screen space and try to vertically align them.
This should make comparing the versions easier.

Fixes #3950.

Signed-off-by: Max <max@nextcloud.com>
mejo- pushed a commit that referenced this issue Mar 23, 2023
@max-nextcloud @mejo-
fix: split layout of conflict view
da02405 
Give both versions 50% of the screen space and try to vertically align them.
This should make comparing the versions easier.

Fixes #3950.

Signed-off-by: Max <max@nextcloud.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

fix: split layout of conflict view nextcloud/text
1 participant
@max-nextcloud