Merge pull request #1860 from nextcloud/fix-text-idle-message-overlap…

…-collabora
nextcloud · Oct 21, 2021 · a470211 · a470211
2 parents aa53c8c + d59cc78
commit a470211
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 22 deletions.
diff --git a/js/editor-rich.js b/js/editor-rich.js
diff --git a/js/editor-rich.js.map b/js/editor-rich.js.map
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-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/EditorWrapper.vue b/src/components/EditorWrapper.vue
@@ -568,7 +568,6 @@ export default {
 	}
 
 	.document-status {
-		z-index: 1010;
 		position: relative;
 		background-color: var(--color-main-background);
 

diff --git a/src/views/RichWorkspace.vue b/src/views/RichWorkspace.vue
@@ -175,6 +175,8 @@ export default {
 		text-align: left;
 		max-height: 0;
 		transition: max-height 0.5s cubic-bezier(0, 1, 0, 1);
+		z-index: 61;
+		position: relative;
 		&.creatable {
 			min-height: 90px;
 		}