From da02405068469c98664de2ee81bdbeb192a73d07 Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Thu, 16 Mar 2023 12:10:43 +0100
Subject: [PATCH] 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 <max@nextcloud.com>
---
 src/components/Editor.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/components/Editor.vue b/src/components/Editor.vue
index 4b8ba7ba4bd..4a2aeffc620 100644
--- a/src/components/Editor.vue
+++ b/src/components/Editor.vue
@@ -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 {