diff --git a/services/web/app/views/project/editor/left-menu.pug b/services/web/app/views/project/editor/left-menu.pug index 5777b9368c..a3715ba7bd 100644 --- a/services/web/app/views/project/editor/left-menu.pug +++ b/services/web/app/views/project/editor/left-menu.pug @@ -179,9 +179,8 @@ aside#left-menu.full-size( name="fontFamily" ng-model="settings.fontFamily" ) - each fontFamily in ['monaco', 'lucida'] - option(value=fontFamily) #{capitalize(fontFamily)} - + option(value='monaco') Monaco / Menlo / Consolas + option(value='lucida') Lucida / Source Code Pro .form-controls label(for="lineHeight") #{translate("line_height")} select( diff --git a/services/web/frontend/fonts/source-code-pro-v13-latin-regular.woff b/services/web/frontend/fonts/source-code-pro-v13-latin-regular.woff new file mode 100644 index 0000000000..9f393eb942 Binary files /dev/null and b/services/web/frontend/fonts/source-code-pro-v13-latin-regular.woff differ diff --git a/services/web/frontend/fonts/source-code-pro-v13-latin-regular.woff2 b/services/web/frontend/fonts/source-code-pro-v13-latin-regular.woff2 new file mode 100644 index 0000000000..90d1a423b4 Binary files /dev/null and b/services/web/frontend/fonts/source-code-pro-v13-latin-regular.woff2 differ diff --git a/services/web/frontend/fonts/source-code-pro.css b/services/web/frontend/fonts/source-code-pro.css new file mode 100644 index 0000000000..be0d2ff03b --- /dev/null +++ b/services/web/frontend/fonts/source-code-pro.css @@ -0,0 +1,8 @@ +@font-face { + font-family: 'Source Code Pro'; + font-style: normal; + font-weight: 400; + src: local('Source Code Pro Regular'), local('SourceCodePro-Regular'), + url('source-code-pro-v13-latin-regular.woff2') format('woff2'), + url('source-code-pro-v13-latin-regular.woff') format('woff'); +} diff --git a/services/web/frontend/js/ide/editor/directives/aceEditor.js b/services/web/frontend/js/ide/editor/directives/aceEditor.js index 4ee7abd283..0244d48fb7 100644 --- a/services/web/frontend/js/ide/editor/directives/aceEditor.js +++ b/services/web/frontend/js/ide/editor/directives/aceEditor.js @@ -469,7 +469,6 @@ App.directive('aceEditor', function( 'Menlo', 'Ubuntu Mono', 'Consolas', - 'source-code-pro', 'monospace' ] @@ -483,7 +482,7 @@ App.directive('aceEditor', function( case 'lucida': return editor.setOption( 'fontFamily', - '"Lucida Console", monospace' + '"Lucida Console", "Source Code Pro", monospace' ) default: return editor.setOption('fontFamily', null) diff --git a/services/web/frontend/stylesheets/style.less b/services/web/frontend/stylesheets/style.less index 3a4fe32fb3..b0b846d63c 100644 --- a/services/web/frontend/stylesheets/style.less +++ b/services/web/frontend/stylesheets/style.less @@ -1,5 +1,6 @@ @import (less) '../fonts/lato.css'; @import (less) '../fonts/merriweather.css'; +@import (less) '../fonts/source-code-pro.css'; @is-overleaf-light : false; @show-rich-text : true;