Merge pull request #1574 from nextcloud/fix/noid/overlap

fix: rich workspaces overlap with new file dropdown
nextcloud · Jul 15, 2021 · 4c69402 · 4c69402
2 parents d1ca93f + 805d691
commit 4c69402
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 23 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
@@ -637,8 +637,7 @@ export default {
 
 			#editor {
 				overflow: auto;
-				// Fix for IE11 issue where the menubar sometimes was positioned under the text
-				z-index: 1000;
+				z-index: 20;
 			}
 			.has-conflicts #editor {
 				padding-top: 0;