Explorar el Código

Merge pull request #3387 from overleaf/cmg-jpa-source-code-pro

Update editor font options and load Source Code Pro

GitOrigin-RevId: 1b3ddcfcc682b484ded93598eb05621f792b2db2
Jakob Ackermann hace 5 años
padre
commit
d2dfc37421

+ 2 - 3
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(

BIN
services/web/frontend/fonts/source-code-pro-v13-latin-regular.woff


BIN
services/web/frontend/fonts/source-code-pro-v13-latin-regular.woff2


+ 8 - 0
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');
+}

+ 1 - 2
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)

+ 1 - 0
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;