Commit bda5398c authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch '201900-ide-scss-monaco-overrides' into 'master'

Web IDE: Scope Monaco related SCSS overrides only to the white theme

See merge request gitlab-org/gitlab!30992
parents 6b9395ee 63de0b81
...@@ -69,8 +69,16 @@ ...@@ -69,8 +69,16 @@
display: none !important; display: none !important;
} }
} }
}
.multi-file-editor-holder {
height: 100%;
min-height: 0; // firefox fix
}
.monaco-diff-editor.vs { // Apply theme related overrides only to the white theme
.theme-white .blob-editor-container {
.monaco-diff-editor {
.editor.modified { .editor.modified {
box-shadow: none; box-shadow: none;
} }
...@@ -131,12 +139,9 @@ ...@@ -131,12 +139,9 @@
} }
} }
.multi-file-editor-holder { .theme-white .multi-file-editor-holder {
height: 100%; &.is-readonly,
min-height: 0; // firefox fix .editor.original {
&.is-readonly .vs,
.vs .editor.original {
.monaco-editor, .monaco-editor,
.monaco-editor-background, .monaco-editor-background,
.monaco-editor .inputarea.ime-input { .monaco-editor .inputarea.ime-input {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment