From 226e971496407e7e3a40890a0be97014bcd63c98 Mon Sep 17 00:00:00 2001 From: YannC <37600690+Skraye@users.noreply.github.com> Date: Fri, 21 Jul 2023 10:08:03 +0200 Subject: [PATCH] feat(): Allow to change fontSize & fontFamily in editor from Settings (#1787) * feat(): Allow to change fontSize & fontFamily in editor from Settings * fix(): review changes --- ui/src/components/inputs/Editor.vue | 6 +- ui/src/components/inputs/MonacoEditor.vue | 2 +- ui/src/components/settings/Settings.vue | 73 ++++++++++++++++++++++- ui/src/translations.json | 4 ++ 4 files changed, 79 insertions(+), 6 deletions(-) diff --git a/ui/src/components/inputs/Editor.vue b/ui/src/components/inputs/Editor.vue index d16d6cc50de..3fcd8192f38 100644 --- a/ui/src/components/inputs/Editor.vue +++ b/ui/src/components/inputs/Editor.vue @@ -20,7 +20,7 @@ - + @@ -185,8 +185,8 @@ return { ...{ tabSize: 2, - fontFamily: "'Source Code Pro', monospace", - fontSize: 12, + fontFamily: localStorage.getItem("editorFontFamily") ? localStorage.getItem("editorFontFamily") : "'Source Code Pro', monospace", + fontSize: localStorage.getItem("editorFontSize") ? parseInt(localStorage.getItem("editorFontSize")) : 12, showFoldingControls: "always", scrollBeyondLastLine: false, roundedSelection: false, diff --git a/ui/src/components/inputs/MonacoEditor.vue b/ui/src/components/inputs/MonacoEditor.vue index f995cf5c073..33f5f9820a6 100644 --- a/ui/src/components/inputs/MonacoEditor.vue +++ b/ui/src/components/inputs/MonacoEditor.vue @@ -12,7 +12,7 @@ import * as monaco from "monaco-editor/esm/vs/editor/editor.api"; import EditorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker"; import YamlWorker from "./yaml.worker.js?worker"; - import JsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'; + import JsonWorker from "monaco-editor/esm/vs/language/json/json.worker?worker"; import {setDiagnosticsOptions} from "monaco-yaml"; import {yamlSchemas} from "override/utils/yamlSchemas" import Utils from "../../utils/utils"; diff --git a/ui/src/components/settings/Settings.vue b/ui/src/components/settings/Settings.vue index 412afa8ebfa..132ba2415e9 100644 --- a/ui/src/components/settings/Settings.vue +++ b/ui/src/components/settings/Settings.vue @@ -1,6 +1,6 @@