diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-15 21:08:49 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-15 21:08:49 +0000 |
commit | cf1d4237a4f226ba2deed26240544da0675a41e5 (patch) | |
tree | 926a71b9279659bc52db0187b463603934718bf2 /app/assets/javascripts/editor | |
parent | 0ac82f99553ce12009970a14c0afc02d1f6515bb (diff) | |
download | gitlab-ce-cf1d4237a4f226ba2deed26240544da0675a41e5.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/editor')
-rw-r--r-- | app/assets/javascripts/editor/editor_lite.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/editor/editor_lite.js b/app/assets/javascripts/editor/editor_lite.js index bdfbcf71267..8711f6e65af 100644 --- a/app/assets/javascripts/editor/editor_lite.js +++ b/app/assets/javascripts/editor/editor_lite.js @@ -1,5 +1,5 @@ import { editor as monacoEditor, languages as monacoLanguages, Uri } from 'monaco-editor'; -import gitlabTheme from '~/ide/lib/themes/gl_theme'; +import whiteTheme from '~/ide/lib/themes/white'; import { defaultEditorOptions } from '~/ide/lib/editor_options'; import { clearDomElement } from './utils'; @@ -19,8 +19,8 @@ export default class Editor { } static setupMonacoTheme() { - monacoEditor.defineTheme(gitlabTheme.themeName, gitlabTheme.monacoTheme); - monacoEditor.setTheme('gitlab'); + monacoEditor.defineTheme('white', whiteTheme); + monacoEditor.setTheme('white'); } createInstance({ el = undefined, blobPath = '', blobContent = '' } = {}) { |