summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/page_bundles
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-15 21:08:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-15 21:08:49 +0000
commitcf1d4237a4f226ba2deed26240544da0675a41e5 (patch)
tree926a71b9279659bc52db0187b463603934718bf2 /app/assets/stylesheets/page_bundles
parent0ac82f99553ce12009970a14c0afc02d1f6515bb (diff)
downloadgitlab-ce-cf1d4237a4f226ba2deed26240544da0675a41e5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/page_bundles')
-rw-r--r--app/assets/stylesheets/page_bundles/ide.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/page_bundles/ide.scss b/app/assets/stylesheets/page_bundles/ide.scss
index 990aca5f0c5..9c64714e5dd 100644
--- a/app/assets/stylesheets/page_bundles/ide.scss
+++ b/app/assets/stylesheets/page_bundles/ide.scss
@@ -296,8 +296,8 @@ $ide-commit-header-height: 48px;
height: 100%;
min-height: 0; // firefox fix
- &.is-readonly,
- .editor.original {
+ &.is-readonly .vs,
+ .vs .editor.original {
.monaco-editor,
.monaco-editor-background,
.monaco-editor .inputarea.ime-input {