commit 69c943d62005d7f8c9e457fad9fba0becedda427
Author: Tom Hughes <tom@compton.nu>
Date: Mon Dec 8 10:12:15 2014 +0000
Use system fonts
diff --git a/src/back/PreviewServer.js b/src/back/PreviewServer.js
index 947bf77..e5572d2 100644
--- a/src/back/PreviewServer.js
+++ b/src/back/PreviewServer.js
@@ -15,6 +15,7 @@ var http = require('http'),
'.jpg' : 'image/jpeg',
'.woff' : 'application/octet-stream',
'.ttf' : 'application/octet-stream',
+ '.otf' : 'application/octet-stream',
'.svg' : 'image/svg+xml',
'.ico' : 'image/x-icon'
};
diff --git a/src/front/Core.css b/src/front/Core.css
index a509cba..deb7f28 100644
--- a/src/front/Core.css
+++ b/src/front/Core.css
@@ -5,10 +5,7 @@
@font-face {
font-family: 'fira_sansbold';
- src: url('./fonts/FiraSans-Bold.eot');
- src: url('./fonts/FiraSans-Bold.eot?#iefix') format('embedded-opentype'),
- url('./fonts/FiraSans-Bold.woff') format('woff'),
- url('./fonts/FiraSans-Bold.ttf') format('truetype');
+ src: url('./fonts/FiraSans-Bold.otf');
font-weight: normal;
font-style: normal;
@@ -17,30 +14,21 @@
@font-face {
font-family: 'fira_sansregular';
- src: url('./fonts/FiraSans-Regular.eot');
- src: url('./fonts/FiraSans-Regular.eot?#iefix') format('embedded-opentype'),
- url('./fonts/FiraSans-Regular.woff') format('woff'),
- url('./fonts/FiraSans-Regular.ttf') format('truetype');
+ src: url('./fonts/FiraSans-Regular.otf');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'fira_sanslight';
- src: url('./fonts/FiraSans-Light.eot');
- src: url('./fonts/FiraSans-Light.eot?#iefix') format('embedded-opentype'),
- url('./fonts/FiraSans-Light.woff') format('woff'),
- url('./fonts/FiraSans-Light.ttf') format('truetype');
+ src: url('./fonts/FiraSans-Light.otf');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'dejavu_sansbook';
- src: url('./fonts/DejaVuSans-webfont.eot');
- src: url('./fonts/DejaVuSans-webfont.eot?#iefix') format('embedded-opentype'),
- url('./fonts/DejaVuSans-webfont.woff') format('woff'),
- url('./fonts/DejaVuSans-webfont.ttf') format('truetype');
+ src: url('./fonts/DejaVuSans.ttf');
font-weight: normal;
font-style: normal;