diff options
| author | Julius Härtl <jus@bitgrid.net> | 2020-09-09 10:21:53 +0300 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2020-09-09 10:23:49 +0300 |
| commit | 638524da5d5a480f52c8e440e20af1394a4b07f1 (patch) | |
| tree | 819cfa31905f3f9950b19ddd15b3e71a5034202c | |
| parent | 12d7c9ad1915c5a9c3a9a4b2d75b219235e08521 (diff) | |
Fix IE styling bugs in rich workspaces and the editor
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | package-lock.json | 18 | ||||
| -rw-r--r-- | src/components/EditorWrapper.vue | 2 | ||||
| -rw-r--r-- | src/views/RichWorkspace.vue | 35 |
3 files changed, 37 insertions, 18 deletions
diff --git a/package-lock.json b/package-lock.json index 9b9964cae..37d825c88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2721,24 +2721,6 @@ } } }, - "@babel/polyfill": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.10.4.tgz", - "integrity": "sha512-8BYcnVqQ5kMD2HXoHInBH7H1b/uP3KdnwCYXOqFnXqguOyuu443WXusbIUbWEfY3Z0Txk0M1uG/8YuAMhNl6zg==", - "dev": true, - "requires": { - "core-js": "^2.6.5", - "regenerator-runtime": "^0.13.4" - }, - "dependencies": { - "core-js": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==", - "dev": true - } - } - }, "@babel/preset-env": { "version": "7.11.0", "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz", diff --git a/src/components/EditorWrapper.vue b/src/components/EditorWrapper.vue index 54c6eeb2e..26d6f0f12 100644 --- a/src/components/EditorWrapper.vue +++ b/src/components/EditorWrapper.vue @@ -575,6 +575,8 @@ export default { #editor { padding-top: 50px; overflow: auto; + // Fix for IE11 issue where the menubar sometimes was positioned under the text + z-index: 1000; } .has-conflicts #editor { padding-top: 0px; diff --git a/src/views/RichWorkspace.vue b/src/views/RichWorkspace.vue index 1f96a1059..9960ad6f6 100644 --- a/src/views/RichWorkspace.vue +++ b/src/views/RichWorkspace.vue @@ -199,6 +199,7 @@ export default { #rich-workspace::v-deep #editor-container { height: 100%; position: unset !important; + top: auto !important; } #rich-workspace::v-deep #editor-wrapper { @@ -262,4 +263,38 @@ export default { } } + html.ie { + #rich-workspace::v-deep { + #editor-container { + position: initial; + } + + #editor-wrapper { + position: relative !important; + top: auto !important; + } + + #editor { + display: flex; + flex-direction: column; + overflow: hidden !important; + } + + .menubar { + position: relative; + overflow: hidden; + flex-shrink: 0; + height: 44px; + top: auto; + } + + #editor > div:nth-child(2) { + min-height: 44px; + overflow-x: hidden; + overflow-y: auto; + flex-shrink: 1; + } + } + } + </style> |