Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix custom font for IE

Browse source
This commit is contained in:
Julia Radzhabova 2022-11-10 00:12:50 +03:00
parent 8f833709d1
commit ea289f0c38
6 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/api/documents/api.js
View file

@ -194,7 +194,7 @@
} / false / true // if false/true - use as init value in de/pe. use instead of customization.spellcheck parameter } / false / true // if false/true - use as init value in de/pe. use instead of customization.spellcheck parameter
}, },
font: { font: {
family: Arial, family: "Arial",
}, },
chat: true, chat: true,
comments: true, comments: true,

3
apps/common/main/resources/less/common.less
View file

@ -298,4 +298,7 @@ body {
&.pixel-ratio__1_75 { &.pixel-ratio__1_75 {
image-rendering: crisp-edges; // FF only image-rendering: crisp-edges; // FF only
} }
font-family: @font-family-sans-serif;
font-family: @font-family-base;
} }

3
apps/common/main/resources/less/variables.less
View file

@ -60,8 +60,7 @@
@font-family-serif: Georgia, "Times New Roman", Times, serif; @font-family-serif: Georgia, "Times New Roman", Times, serif;
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; @font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-tahoma: tahoma, arial, verdana, sans-serif; @font-family-tahoma: tahoma, arial, verdana, sans-serif;
@font-family-base: @font-family-sans-serif; @font-family-base: var(--font-family-base-custom, @font-family-sans-serif), @font-family-sans-serif;
@font-family-base: var(--font-family-base-custom, @font-family-sans-serif);
@font-size-base: 11px; @font-size-base: 11px;
@font-size-large: 13px; @font-size-large: 13px;

2
apps/documenteditor/main/app/controller/Main.js
View file

@ -381,7 +381,7 @@ define([
Common.Utils.InternalSettings.set("save-guest-username", !!value); Common.Utils.InternalSettings.set("save-guest-username", !!value);
} }
if (this.appOptions.customization.font) { if (this.appOptions.customization.font) {
this.appOptions.customization.font.family && document.documentElement.style.setProperty("--font-family-base-custom", this.appOptions.customization.font.family); this.appOptions.customization.font.family && document.documentElement.style.setProperty("--font-family-base-custom", "'" + this.appOptions.customization.font.family + "'");
} }
this.editorConfig.user = this.editorConfig.user =

2
apps/presentationeditor/main/app/controller/Main.js
View file

@ -340,7 +340,7 @@ define([
Common.Utils.InternalSettings.set("save-guest-username", !!value); Common.Utils.InternalSettings.set("save-guest-username", !!value);
} }
if (this.appOptions.customization.font) { if (this.appOptions.customization.font) {
this.appOptions.customization.font.family && document.documentElement.style.setProperty("--font-family-base-custom", this.appOptions.customization.font.family); this.appOptions.customization.font.family && document.documentElement.style.setProperty("--font-family-base-custom", "'" + this.appOptions.customization.font.family + "'");
} }
this.editorConfig.user = this.editorConfig.user =

2
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -378,7 +378,7 @@ define([
Common.Utils.InternalSettings.set("save-guest-username", !!value); Common.Utils.InternalSettings.set("save-guest-username", !!value);
} }
if (this.appOptions.customization.font) { if (this.appOptions.customization.font) {
this.appOptions.customization.font.family && document.documentElement.style.setProperty("--font-family-base-custom", this.appOptions.customization.font.family); this.appOptions.customization.font.family && document.documentElement.style.setProperty("--font-family-base-custom", "'" + this.appOptions.customization.font.family + "'");
} }
this.editorConfig.user = this.editorConfig.user =