diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js index b32a1f03ca..d9c7bfed03 100644 --- a/services/web/app/src/Features/Project/ProjectController.js +++ b/services/web/app/src/Features/Project/ProjectController.js @@ -806,8 +806,8 @@ const ProjectController = { autoPairDelimiters: user.ace.autoPairDelimiters, pdfViewer: user.ace.pdfViewer, syntaxValidation: user.ace.syntaxValidation, - fontFamily: user.ace.fontFamily, - lineHeight: user.ace.lineHeight, + fontFamily: user.ace.fontFamily || 'lucida', + lineHeight: user.ace.lineHeight || 'normal', overallTheme: user.ace.overallTheme }, trackChangesState: project.track_changes, diff --git a/services/web/app/src/infrastructure/ExpressLocals.js b/services/web/app/src/infrastructure/ExpressLocals.js index 29089305d7..b8c9cb207a 100644 --- a/services/web/app/src/infrastructure/ExpressLocals.js +++ b/services/web/app/src/infrastructure/ExpressLocals.js @@ -321,9 +321,7 @@ module.exports = function(webRouter, privateApiRouter, publicApiRouter) { chatMessageBorderSaturation: '85%', chatMessageBorderLightness: '40%', chatMessageBgSaturation: '85%', - chatMessageBgLightness: '40%', - defaultFontFamily: 'lucida', - defaultLineHeight: 'normal' + chatMessageBgLightness: '40%' } next() }) diff --git a/services/web/app/views/project/editor/editor.pug b/services/web/app/views/project/editor/editor.pug index ab890fe9c2..84b08e8d41 100644 --- a/services/web/app/views/project/editor/editor.pug +++ b/services/web/app/views/project/editor/editor.pug @@ -77,8 +77,8 @@ div.full-size( track-changes= "editor.trackChanges", doc-id="editor.open_doc_id" renderer-data="reviewPanel.rendererData" - font-family="settings.fontFamily || ui.defaultFontFamily" - line-height="settings.lineHeight || ui.defaultLineHeight" + font-family="settings.fontFamily" + line-height="settings.lineHeight" ) if !isRestrictedTokenMember diff --git a/services/web/app/views/project/editor/left-menu.pug b/services/web/app/views/project/editor/left-menu.pug index dd07ee4617..a407f3c016 100644 --- a/services/web/app/views/project/editor/left-menu.pug +++ b/services/web/app/views/project/editor/left-menu.pug @@ -169,7 +169,6 @@ aside#left-menu.full-size( name="fontFamily" ng-model="settings.fontFamily" ) - option(value="", disabled) #{translate("default")} each fontFamily in ['monaco', 'lucida'] option(value=fontFamily) #{capitalize(fontFamily)} @@ -179,7 +178,6 @@ aside#left-menu.full-size( name="lineHeight" ng-model="settings.lineHeight" ) - option(value="", disabled) #{translate("default")} each lineHeight in ['compact', 'normal', 'wide'] option(value=lineHeight) #{translate(lineHeight)} diff --git a/services/web/frontend/js/ide.js b/services/web/frontend/js/ide.js index 02ec401726..f508db6f77 100644 --- a/services/web/frontend/js/ide.js +++ b/services/web/frontend/js/ide.js @@ -117,9 +117,7 @@ define([ reviewPanelOpen: localStorage(`ui.reviewPanelOpen.${window.project_id}`), miniReviewPanelVisible: false, chatResizerSizeOpen: window.uiConfig.chatResizerSizeOpen, - chatResizerSizeClosed: window.uiConfig.chatResizerSizeClosed, - defaultFontFamily: window.uiConfig.defaultFontFamily, - defaultLineHeight: window.uiConfig.defaultLineHeight + chatResizerSizeClosed: window.uiConfig.chatResizerSizeClosed } $scope.user = window.user