Skip to content

Commit

Permalink
fix: split layout of conflict view
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
max-nextcloud authored and mejo- committed Mar 23, 2023
1 parent 7a27c46 commit da02405
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions src/components/Editor.vue
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

0 comments on commit da02405

Please sign in to comment.