From 99664e76e756c8b3cafe5c6d99e3ab27bd10fbb9 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 1 Nov 2024 12:06:45 +0200 Subject: [PATCH] font familiy in variable --- client/src/helpers/misc/summernote-custom.js | 2 +- client/src/views/fields/complex-expression.js | 2 +- client/src/views/fields/formula.js | 2 +- client/src/views/template/fields/style.js | 2 +- frontend/less/espo/root-variables.less | 3 +++ frontend/less/espo/variables.less | 4 ++-- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/client/src/helpers/misc/summernote-custom.js b/client/src/helpers/misc/summernote-custom.js index c81e4ff5b7..678cbb26d0 100644 --- a/client/src/helpers/misc/summernote-custom.js +++ b/client/src/helpers/misc/summernote-custom.js @@ -459,7 +459,7 @@ function init(langSets) { useSoftTabs: true, }); - aceEditor.setOptions({fontFamily: 'JetBrainsMono'}); + aceEditor.setOptions({fontFamily: 'var(--font-family-monospace)'}); aceEditor.setFontSize('var(--font-size-small)'); aceEditor.container.style.lineHeight = 'var(--line-height-small)'; aceEditor.renderer.updateFontSize(); diff --git a/client/src/views/fields/complex-expression.js b/client/src/views/fields/complex-expression.js index 9848bdcbc7..88bd5701d1 100644 --- a/client/src/views/fields/complex-expression.js +++ b/client/src/views/fields/complex-expression.js @@ -141,7 +141,7 @@ class ComplexExpressionFieldView extends TextFieldView { const editor = this.editor = ace.edit(this.containerId); - editor.setOptions({fontFamily: 'JetBrainsMono'}); + editor.setOptions({fontFamily: 'var(--font-family-monospace)'}); editor.setFontSize('var(--font-size-base)'); editor.container.style.lineHeight = 'var(--line-height-computed)'; editor.renderer.updateFontSize(); diff --git a/client/src/views/fields/formula.js b/client/src/views/fields/formula.js index 68ef9617e5..a32b68ce45 100644 --- a/client/src/views/fields/formula.js +++ b/client/src/views/fields/formula.js @@ -155,7 +155,7 @@ class FormulaFieldView extends TextFieldView { const editor = this.editor = ace.edit(this.containerId); - editor.setOptions({fontFamily: 'JetBrainsMono'}); + editor.setOptions({fontFamily: 'var(--font-family-monospace)'}); editor.setFontSize('var(--font-size-base)'); editor.container.style.lineHeight = 'var(--line-height-computed)'; editor.renderer.updateFontSize(); diff --git a/client/src/views/template/fields/style.js b/client/src/views/template/fields/style.js index 57d100283e..2cd2c1ac0b 100644 --- a/client/src/views/template/fields/style.js +++ b/client/src/views/template/fields/style.js @@ -135,7 +135,7 @@ class TemplateStyleFieldView extends TextFieldView { const editor = this.editor = ace.edit(this.containerId); - editor.setOptions({fontFamily: 'JetBrainsMono'}); + editor.setOptions({fontFamily: 'var(--font-family-monospace)'}); editor.setFontSize('var(--font-size-base)'); editor.container.style.lineHeight = 'var(--line-height-computed)'; editor.renderer.updateFontSize(); diff --git a/frontend/less/espo/root-variables.less b/frontend/less/espo/root-variables.less index 5531a18f66..0faa933bdd 100644 --- a/frontend/less/espo/root-variables.less +++ b/frontend/less/espo/root-variables.less @@ -81,6 +81,9 @@ --1300px: 81.25rem; --1440px: 90rem; + --font-family: Inter, sans-serif; + --font-family-monospace: JetBrainsMono, monospace; + --font-size-base: var(--14px); --font-size-large: var(--18px); --font-size-small: var(--12px); diff --git a/frontend/less/espo/variables.less b/frontend/less/espo/variables.less index 39ca1e70b0..f0b99475cf 100644 --- a/frontend/less/espo/variables.less +++ b/frontend/less/espo/variables.less @@ -55,8 +55,8 @@ @headings-line-height: 1; -@font-family-base: Inter, sans-serif; -@font-family-monospace: JetBrainsMono, Menlo, Monaco, Consolas, "Courier New", monospace; +@font-family-base: var(--font-familiy); +@font-family-monospace: var(--font-family-monospace); @icon-font-path: "../../fonts/";