Merge pull request #1769 from nextcloud/backport/1574/stable22

[stable22] fix: rich workspaces overlap with new file dropdown
nextcloud · Jul 15, 2021 · 8bf082f · 8bf082f
2 parents 5530ed3 + c2620d2
commit 8bf082f
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 14 deletions.
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.js b/js/files.js
diff --git a/js/files.js.map b/js/files.js.map
diff --git a/js/public.js b/js/public.js
diff --git a/js/public.js.map b/js/public.js.map
diff --git a/js/text.js b/js/text.js
diff --git a/js/text.js.map b/js/text.js.map
diff --git a/js/viewer.js b/js/viewer.js
diff --git a/js/viewer.js.map b/js/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;