diff --git a/src/locales/en.json b/src/locales/en.json
index 5a86a6618..4aa5769b9 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -38,27 +38,6 @@
"pad.settings.rtlcheck": "Read content from right to left?",
"pad.settings.fontType": "Font type:",
"pad.settings.fontType.normal": "Normal",
- "pad.settings.fontType.opendyslexic": "Open Dyslexic",
- "pad.settings.fontType.monospaced": "Monospace",
- "pad.settings.fontType.montserrat": "Montserrat",
- "pad.settings.fontType.comicsans": "Comic Sans",
- "pad.settings.fontType.couriernew": "Courier New",
- "pad.settings.fontType.georgia": "Georgia",
- "pad.settings.fontType.impact": "Impact",
- "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",
- "pad.settings.fontType.verdana": "Verdana",
- "pad.settings.fontType.symbol": "Symbol",
- "pad.settings.fontType.webdings": "Webdings",
- "pad.settings.fontType.wingdings": "Wingdings",
- "pad.settings.fontType.sansserif": "Sans Serif",
- "pad.settings.fontType.serif": "Serif",
- "pad.settings.globalView": "Global View",
"pad.settings.language": "Language:",
"pad.importExport.import_export": "Import/Export",
diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 83b6f8bad..7e8efccdb 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -13,9 +13,9 @@
@import url("pad/loadingbox.css");
html {
- font-size: 13px;
- font-family: Arial, sans-serif;
- line-height: 16px;
+ font-size: 14px;
+ font-family: Cantarell, Roboto, "Open Sans", "Helvetica Neue", Arial, sans-serif;
+ line-height: 20px;
color: #3e3e3e;
}
.clear {
diff --git a/src/static/css/pad/fonts.css b/src/static/css/pad/fonts.css
index f4c6e6f33..60b083ff6 100644
--- a/src/static/css/pad/fonts.css
+++ b/src/static/css/pad/fonts.css
@@ -17,8 +17,6 @@
font-family: opendyslexic;
src: url("../../../static/font/opendyslexic.otf") format("opentype");
}
-
-/* Roboto Mono */
@font-face {
font-family: "RobotoMono";
src: url("../../../static/font/RobotoMono-Regular.ttf") format("truetype");
@@ -31,4 +29,33 @@
font-weight: bold;
font-style: normal;
}
-/* End of Roboto Mono */
\ No newline at end of file
+@font-face {
+ font-family: "Quicksand";
+ src: url("../../../static/font/Quicksand-Regular.ttf") format("truetype");
+ font-weight: 300;
+ font-style: normal;
+}
+@font-face {
+ font-family: "Quicksand";
+ src: url("../../../static/font/Quicksand-Medium.ttf") format("truetype");
+ font-weight: normal;
+ font-style: normal;
+}
+@font-face {
+ font-family: "Quicksand";
+ src: url("../../../static/font/Quicksand-Bold.ttf") format("truetype");
+ font-weight: bold;
+ font-style: normal;
+}
+@font-face {
+ font-family: "Roboto";
+ src: url("../../../static/font/Roboto-Regular.ttf") format("truetype");
+ font-weight: normal;
+ font-style: normal;
+}
+@font-face {
+ font-family: "Roboto";
+ src: url("../../../static/font/Roboto-Bold.ttf") format("truetype");
+ font-weight: bold;
+ font-style: normal;
+}
\ No newline at end of file
diff --git a/src/static/font/Quicksand-Bold.ttf b/src/static/font/Quicksand-Bold.ttf
new file mode 100644
index 000000000..49326cda8
Binary files /dev/null and b/src/static/font/Quicksand-Bold.ttf differ
diff --git a/src/static/font/Quicksand-Medium.ttf b/src/static/font/Quicksand-Medium.ttf
new file mode 100644
index 000000000..7dc8c2745
Binary files /dev/null and b/src/static/font/Quicksand-Medium.ttf differ
diff --git a/src/static/font/Quicksand-Regular.ttf b/src/static/font/Quicksand-Regular.ttf
new file mode 100644
index 000000000..9fdce17db
Binary files /dev/null and b/src/static/font/Quicksand-Regular.ttf differ
diff --git a/src/static/font/Roboto-Bold.ttf b/src/static/font/Roboto-Bold.ttf
new file mode 100644
index 000000000..d998cf5b4
Binary files /dev/null and b/src/static/font/Roboto-Bold.ttf differ
diff --git a/src/static/font/Roboto-Regular.ttf b/src/static/font/Roboto-Regular.ttf
new file mode 100644
index 000000000..2b6392ffe
Binary files /dev/null and b/src/static/font/Roboto-Regular.ttf differ
diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js
index c59a2fc61..621f37aec 100644
--- a/src/static/js/pad_editor.js
+++ b/src/static/js/pad_editor.js
@@ -141,29 +141,7 @@ var padeditor = (function()
self.ace.setProperty("showsauthorcolors", !settings.noColors);
}
- var fontFamily = newOptions['padFontFamily'];
- switch (fontFamily) {
- case "monospace": self.ace.setProperty("textface", "monospace"); break;
- case "montserrat": self.ace.setProperty("textface", "Montserrat"); break;
- case "opendyslexic": self.ace.setProperty("textface", "OpenDyslexic"); break;
- case "comicsans": self.ace.setProperty("textface", "'Comic Sans MS','Comic Sans',cursive"); break;
- case "georgia": self.ace.setProperty("textface", "Georgia,'Bitstream Charter',serif"); break;
- case "impact": self.ace.setProperty("textface", "Impact,Haettenschweiler,'Arial Black',sans-serif"); break;
- case "lucida": self.ace.setProperty("textface", "Lucida,'Lucida Serif','Lucida Bright',serif"); break;
- case "lucidasans": self.ace.setProperty("textface", "'Lucida Sans','Lucida Grande','Lucida Sans Unicode','Luxi Sans',sans-serif"); break;
- case "palatino": self.ace.setProperty("textface", "Palatino,'Palatino Linotype','URW Palladio L',Georgia,serif"); break;
- case "robotomono": self.ace.setProperty("textface", "RobotoMono"); break;
- case "tahoma": self.ace.setProperty("textface", "Tahoma,sans-serif"); break;
- case "timesnewroman": self.ace.setProperty("textface", "'Times New Roman',Times,serif"); break;
- case "trebuchet": self.ace.setProperty("textface", "'Trebuchet MS',sans-serif"); break;
- case "verdana": self.ace.setProperty("textface", "Verdana,'DejaVu Sans',sans-serif"); break;
- case "symbol": self.ace.setProperty("textface", "Symbol"); break;
- case "webdings": self.ace.setProperty("textface", "Webdings"); break;
- case "wingdings": self.ace.setProperty("textface", "Wingdings"); break;
- case "sansserif": self.ace.setProperty("textface", "sans-serif"); break;
- case "serif": self.ace.setProperty("textface", "serif"); break;
- default: self.ace.setProperty("textface", ""); break;
- }
+ self.ace.setProperty("textface", newOptions['padFontFamily'] || "");
},
dispose: function()
{
diff --git a/src/static/js/timeslider.js b/src/static/js/timeslider.js
index 297f3ee70..5ac56bea1 100644
--- a/src/static/js/timeslider.js
+++ b/src/static/js/timeslider.js
@@ -165,33 +165,9 @@ function handleClientVars(message)
// font family change
$("#viewfontmenu").change(function(){
- var font = $("#viewfontmenu").val();
- switch (font) {
- case "monospace": setFont("Courier new");break;
- case "opendyslexic": setFont("OpenDyslexic");break;
- case "comicsans": setFont("Comic Sans MS");break;
- case "georgia": setFont("Georgia");break;
- case "impact": setFont("Impact");break;
- case "lucida": setFont("Lucida");break;
- case "lucidasans": setFont("Lucida Sans Unicode");break;
- case "palatino": setFont("Palatino Linotype");break;
- case "tahoma": setFont("Tahoma");break;
- case "timesnewroman": setFont("Times New Roman");break;
- case "trebuchet": setFont("Trebuchet MS");break;
- case "verdana": setFont("Verdana");break;
- case "symbol": setFont("Symbol");break;
- case "webdings": setFont("Webdings");break;
- case "wingdings": setFont("Wingdings");break;
- case "sansserif": setFont("MS Sans Serif");break;
- case "serif": setFont("MS Serif");break;
- default: setFont("");break;
- }
+ $('#innerdocbody').css("font-family", $(this).val() || "");
});
}
-function setFont(font){
- $('#innerdocbody').css("font-family", font);
-}
-
exports.baseURL = '';
exports.init = init;
diff --git a/src/static/skins/colibris/pad.css b/src/static/skins/colibris/pad.css
index e0ddac3ea..6e9990389 100644
--- a/src/static/skins/colibris/pad.css
+++ b/src/static/skins/colibris/pad.css
@@ -95,21 +95,5 @@ p[data-l10n-id="ep_comments_page.comment"],
background-color: #f9f9f9 !important;
}
-
-/* NEUTRAL FONT */
-body
-{ font-family: Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; }
-
-/* PRIMARY FONT */
-h1,
-#titlelabel,
-#chatlabel,
-.btn,
-.yui-skin-sam .yui-panel .hd,
-.reply-suggestion p:not(.reply-comment-suggest-from-p),
-p[data-l10n-id="ep_comments_page.comment"],
-#newComment.sidebar-comment input[type=submit],
-.comment-changeTo-approve input[type=submit],
-#sidedivinner>div:before
-{ font-family: Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif !important; }
-
+/* FONT */
+body { font-family: Quicksand, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; }
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 397010ca9..5b90ef861 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -146,26 +146,14 @@
<% e.begin_block("mySettings.dropdowns"); %>
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index e3c8a5694..77d325217 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -3,7 +3,7 @@
, langs = require("ep_etherpad-lite/node/hooks/i18n").availableLangs
%>
-
+
<%=settings.title%> Timeslider