diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-06 21:09:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-06 21:09:43 +0300 |
| commit | 33998a0e768263828f497685ae030f585193317f (patch) | |
| tree | 791e2c3322a17f668a2a4abdd251a8362885f381 /app/assets/javascripts/ide | |
| parent | 7b69a22d499787378aa30561822ef797a99c22e5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ide')
| -rw-r--r-- | app/assets/javascripts/ide/lib/editor_options.js | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/app/assets/javascripts/ide/lib/editor_options.js b/app/assets/javascripts/ide/lib/editor_options.js index 289027c3054..7a516f5e3f5 100644 --- a/app/assets/javascripts/ide/lib/editor_options.js +++ b/app/assets/javascripts/ide/lib/editor_options.js @@ -1,12 +1,5 @@ -import { useNewFonts } from '~/lib/utils/common_utils'; import { getCssVariable } from '~/lib/utils/css_utils'; -const fontOptions = {}; - -if (useNewFonts()) { - fontOptions.fontFamily = getCssVariable('--code-editor-font'); -} - export const defaultEditorOptions = { model: null, readOnly: false, @@ -18,7 +11,7 @@ export const defaultEditorOptions = { wordWrap: 'on', glyphMargin: true, automaticLayout: true, - ...fontOptions, + fontFamily: getCssVariable('--code-editor-font'), }; export const defaultDiffOptions = { |