fuwafuwa/etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3206 from 00SteinsGate00/RobotoMono

Browse Source 
Added RobotoMono as a more modern and pretty monospaced font
This commit is contained in:
Luiza Pagliari 2017-07-12 08:02:09 -03:00 committed by GitHub
commit 8c57c8d0d6
7 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/locales/en.json
View File

@ -47,6 +47,7 @@
"pad.settings.fontType.lucida": "Lucida",
"pad.settings.fontType.lucidasans": "Lucida Sans",
"pad.settings.fontType.palatino": "Palatino",
"pad.settings.fontType.robotomono": "RobotoMono",
"pad.settings.fontType.tahoma": "Tahoma",
"pad.settings.fontType.timesnewroman": "Times New Roman",
"pad.settings.fontType.trebuchet": "Trebuchet",

17
src/static/css/pad.css
View File

@ -1277,6 +1277,21 @@ input[type=checkbox] {
src: url("../../static/font/opendyslexic.otf") format("opentype");
}
/* Roboto Mono */
@font-face {
font-family: "RobotoMono";
src: url("../../static/font/RobotoMono-Regular.ttf") format("truetype");
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: "RobotoMono";
src: url("../../static/font/RobotoMono-Bold.ttf") format("truetype");
font-weight: bold;
font-style: normal;
}
/* End of Roboto Mono */
@font-face {
font-family: "fontawesome-etherpad";
src:url("../../static/font/fontawesome-etherpad.eot");
@ -1321,5 +1336,3 @@ input[type=checkbox] {
.hideControlsEditbar{
display:none !important;
}

BIN
src/static/font/RobotoMono-Bold.ttf Executable file
View File

Binary file not shown.

BIN
src/static/font/RobotoMono-Regular.ttf Executable file
View File

Binary file not shown.

2
src/static/js/pad.js
View File

@ -555,7 +555,7 @@ var pad = {
}
var fonts = ['useMonospaceFont', 'useOpenDyslexicFont', 'useComicSansFont', 'useCourierNewFont', 'useGeorgiaFont', 'useImpactFont',
'useLucidaFont', 'useLucidaSansFont', 'usePalatinoFont', 'useTahomaFont', 'useTimesNewRomanFont',
'useLucidaFont', 'useLucidaSansFont', 'usePalatinoFont', 'useRobotoMonoFont', 'useTahomaFont', 'useTimesNewRomanFont',
'useTrebuchetFont', 'useVerdanaFont', 'useSymbolFont', 'useWebdingsFont', 'useWingDingsFont', 'useSansSerifFont',
'useSerifFont'];

7
src/static/js/pad_editor.js
View File

@ -1,5 +1,5 @@
/**
* This code is mostly from the old Etherpad. Please help us to comment this code.
* This code is mostly from the old Etherpad. Please help us to comment this code.
* This helps other people to understand this code better and helps them to improve it.
* TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
*/
@ -31,7 +31,7 @@ var padeditor = (function()
// Array of available fonts
var fonts = ['useMonospaceFont', 'useOpenDyslexicFont', 'useComicSansFont', 'useCourierNewFont', 'useGeorgiaFont', 'useImpactFont',
'useLucidaFont', 'useLucidaSansFont', 'usePalatinoFont', 'useTahomaFont', 'useTimesNewRomanFont',
'useLucidaFont', 'useLucidaSansFont', 'usePalatinoFont', 'useRobotoMonoFont', 'useTahomaFont', 'useTimesNewRomanFont',
'useTrebuchetFont', 'useVerdanaFont', 'useSymbolFont', 'useWebdingsFont', 'useWingDingsFont', 'useSansSerifFont',
'useSerifFont'];
@ -102,7 +102,7 @@ var padeditor = (function()
pad.changeViewOption(font, $("#viewfontmenu").val() == sfont);
});
});
// Language
html10n.bind('localized', function() {
$("#languagemenu").val(html10n.getLanguage());
@ -168,6 +168,7 @@ var padeditor = (function()
if(font === "lucida") self.ace.setProperty("textface", "Lucida,'Lucida Serif','Lucida Bright',serif");
if(font === "lucidasans") self.ace.setProperty("textface", "'Lucida Sans','Lucida Grande','Lucida Sans Unicode','Luxi Sans',sans-serif");
if(font === "palatino") self.ace.setProperty("textface", "Palatino,'Palatino Linotype','URW Palladio L',Georgia,serif");
if(font === "robotomono") self.ace.setProperty("textface", "RobotoMono");
if(font === "tahoma") self.ace.setProperty("textface", "Tahoma,sans-serif");
if(font === "timesnewroman") self.ace.setProperty("textface", "'Times New Roman',Times,serif");
if(font === "trebuchet") self.ace.setProperty("textface", "'Trebuchet MS',sans-serif");

1
src/templates/pad.html
View File

@ -168,6 +168,7 @@
<option value="lucida" data-l10n-id="pad.settings.fontType.lucida"></option>
<option value="lucidasans" data-l10n-id="pad.settings.fontType.lucidasans"></option>
<option value="palatino" data-l10n-id="pad.settings.fontType.palatino"></option>
<option value="robotomono" data-l10n-id="pad.settings.fontType.robotomono"></option>
<option value="tahoma" data-l10n-id="pad.settings.fontType.tahoma"></option>
<option value="timesnewroman" data-l10n-id="pad.settings.fontType.timesnewroman"></option>
<option value="trebuchet" data-l10n-id="pad.settings.fontType.trebuchet"></option>