Merge pull request #3959 from nextcloud/backport/3951/stable26

[stable26] fix: split layout of conflict view
nextcloud · Mar 23, 2023 · e46d416 · e46d416
2 parents 7a27c46 + 0c78316
commit e46d416
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 22 deletions.
diff --git a/cypress/e2e/sync.spec.js b/cypress/e2e/sync.spec.js
@@ -95,7 +95,7 @@ describe('Sync', () => {
 			.should('include', 'after the lost connection')
 	})
 
-	it.only('passes the doc content from one session to the next', () => {
+	it('passes the doc content from one session to the next', () => {
 		cy.closeFile()
 		cy.intercept({ method: 'PUT', url: '**/apps/text/session/create' })
 			.as('create')

diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/files-modal.js b/js/files-modal.js
diff --git a/js/files-modal.js.map b/js/files-modal.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git 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 {