Skip to content

fix: split layout of conflict view #3951

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

Merged
mejo- merged 3 commits into from
Mar 17, 2023
Merged

fix: split layout of conflict view #3951

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e83f2db
fix: split layout of conflict view
max-nextcloud Mar 16, 2023
21d48ec
fix: run all the sync tests again
max-nextcloud Mar 16, 2023
4f215d0
Compile assets
nextcloud-command Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: split layout of conflict view 
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 <[email protected]>
  • Loading branch information
@max-nextcloud @mejo-
max-nextcloud authored and mejo- committed Mar 16, 2023
commit e83f2db0c35620b3174b929660d75686871c6f0d
12 changes: 12 additions & 0 deletions src/components/Editor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,6 +875,18 @@ export default {
}
}

.text-editor__wrapper.has-conflicts > .editor {
width: 50%;
}

.text-editor__wrapper.has-conflicts > .content-wrapper {
width: 50%;
#read-only-editor {
margin: 0px;
padding-top: 50px;
}
}

// Required in order to make the public pages behave the same if talk is enabled or not
// as Talk overwrites the public page styles and changes the DOM layout for the sidebar injection
#files-public-content {
Expand Down