diff --git a/client/components/App.vue b/client/components/App.vue index 6167d27b..230442c6 100644 --- a/client/components/App.vue +++ b/client/components/App.vue @@ -260,9 +260,63 @@ body, html, #app { } @font-face { - font-family: 'ReaderDefaultFont'; - src: - url('fonts/reader-default-font.ttf') format('truetype'); + font-family: 'ReaderDefault'; + src: url('fonts/reader-default.woff') format('woff'), + url('fonts/reader-default.ttf') format('truetype'); } -/*url('fonts/myfont.woff') format('woff'),*/ + +@font-face { + font-family: 'Arial'; + src: url('fonts/arial.woff') format('woff'), + url('fonts/arial.ttf') format('truetype'); +} + +@font-face { + font-family: 'ComicSansMS'; + src: url('fonts/comic-sans-ms.woff') format('woff'), + url('fonts/comic-sans-ms.ttf') format('truetype'); +} + +@font-face { + font-family: 'OpenSans'; + src: url('fonts/open-sans.woff') format('woff'), + url('fonts/open-sans.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto'; + src: url('fonts/roboto.woff') format('woff'), + url('fonts/roboto.ttf') format('truetype'); +} + +@font-face { + font-family: 'ArialNarrow'; + src: url('fonts/arial-narrow.woff') format('woff'), + url('fonts/arial-narrow.ttf') format('truetype'); +} + +@font-face { + font-family: 'Georgia'; + src: url('fonts/georgia.woff') format('woff'), + url('fonts/georgia.ttf') format('truetype'); +} + +@font-face { + font-family: 'Tahoma'; + src: url('fonts/tahoma.woff') format('woff'), + url('fonts/tahoma.ttf') format('truetype'); +} + +@font-face { + font-family: 'Helvetica'; + src: url('fonts/helvetica.woff') format('woff'), + url('fonts/helvetica.ttf') format('truetype'); +} + +@font-face { + font-family: 'CenturySchoolbook'; + src: url('fonts/century-schoolbook.woff') format('woff'), + url('fonts/century-schoolbook.ttf') format('truetype'); +} + diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue index cda6bf81..c066abde 100644 --- a/client/components/Reader/TextPage/TextPage.vue +++ b/client/components/Reader/TextPage/TextPage.vue @@ -90,14 +90,15 @@ class TextPage extends Vue { this.linesDown = null; //preloaded fonts - this.fontList = ['10px ReaderDefaultFont']; + this.fontList = ['12px ReaderDefault', '12px Arial', '12px ComicSansMS', '12px OpenSans', '12px Roboto', '12px ArialNarrow', + '12px Georgia', '12px Tahoma', '12px Helvetica', '12px CenturySchoolbook']; //draw props this.textColor = 'black'; this.backgroundColor = '#478355'; this.fontStyle = '';// 'bold','italic' this.fontSize = 40;// px - this.fontName = 'ReaderDefaultFont'; + this.fontName = 'Arial'; this.lineInterval = 15;// px, межстрочный интервал this.textAlignJustify = true;// выравнивание по ширине this.p = 60;// px, отступ параграфа diff --git a/client/components/fonts/arial-narrow.ttf b/client/components/fonts/arial-narrow.ttf new file mode 100644 index 00000000..180e20d2 Binary files /dev/null and b/client/components/fonts/arial-narrow.ttf differ diff --git a/client/components/fonts/arial-narrow.woff b/client/components/fonts/arial-narrow.woff new file mode 100644 index 00000000..48ae66c2 Binary files /dev/null and b/client/components/fonts/arial-narrow.woff differ diff --git a/client/components/fonts/arial.ttf b/client/components/fonts/arial.ttf new file mode 100644 index 00000000..084f0622 Binary files /dev/null and b/client/components/fonts/arial.ttf differ diff --git a/client/components/fonts/arial.woff b/client/components/fonts/arial.woff new file mode 100644 index 00000000..e6cdcacc Binary files /dev/null and b/client/components/fonts/arial.woff differ diff --git a/client/components/fonts/century-schoolbook.ttf b/client/components/fonts/century-schoolbook.ttf new file mode 100644 index 00000000..f3951021 Binary files /dev/null and b/client/components/fonts/century-schoolbook.ttf differ diff --git a/client/components/fonts/century-schoolbook.woff b/client/components/fonts/century-schoolbook.woff new file mode 100644 index 00000000..3888c477 Binary files /dev/null and b/client/components/fonts/century-schoolbook.woff differ diff --git a/client/components/fonts/comic-sans-ms.ttf b/client/components/fonts/comic-sans-ms.ttf new file mode 100644 index 00000000..22d56947 Binary files /dev/null and b/client/components/fonts/comic-sans-ms.ttf differ diff --git a/client/components/fonts/comic-sans-ms.woff b/client/components/fonts/comic-sans-ms.woff new file mode 100644 index 00000000..f9aaf8bd Binary files /dev/null and b/client/components/fonts/comic-sans-ms.woff differ diff --git a/client/components/fonts/georgia.ttf b/client/components/fonts/georgia.ttf new file mode 100644 index 00000000..317b8516 Binary files /dev/null and b/client/components/fonts/georgia.ttf differ diff --git a/client/components/fonts/georgia.woff b/client/components/fonts/georgia.woff new file mode 100644 index 00000000..078453a9 Binary files /dev/null and b/client/components/fonts/georgia.woff differ diff --git a/client/components/fonts/helvetica.ttf b/client/components/fonts/helvetica.ttf new file mode 100644 index 00000000..d944a13f Binary files /dev/null and b/client/components/fonts/helvetica.ttf differ diff --git a/client/components/fonts/helvetica.woff b/client/components/fonts/helvetica.woff new file mode 100644 index 00000000..66d9328a Binary files /dev/null and b/client/components/fonts/helvetica.woff differ diff --git a/client/components/fonts/open-sans.ttf b/client/components/fonts/open-sans.ttf new file mode 100644 index 00000000..c9cf7ed9 Binary files /dev/null and b/client/components/fonts/open-sans.ttf differ diff --git a/client/components/fonts/open-sans.woff b/client/components/fonts/open-sans.woff new file mode 100644 index 00000000..b25112b6 Binary files /dev/null and b/client/components/fonts/open-sans.woff differ diff --git a/client/components/fonts/reader-default.ttf b/client/components/fonts/reader-default.ttf new file mode 100644 index 00000000..9a588c17 Binary files /dev/null and b/client/components/fonts/reader-default.ttf differ diff --git a/client/components/fonts/reader-default.woff b/client/components/fonts/reader-default.woff new file mode 100644 index 00000000..bfb43ebf Binary files /dev/null and b/client/components/fonts/reader-default.woff differ diff --git a/client/components/fonts/roboto.ttf b/client/components/fonts/roboto.ttf new file mode 100644 index 00000000..4a3a5e6f Binary files /dev/null and b/client/components/fonts/roboto.ttf differ diff --git a/client/components/fonts/roboto.woff b/client/components/fonts/roboto.woff new file mode 100644 index 00000000..b2ac07b1 Binary files /dev/null and b/client/components/fonts/roboto.woff differ diff --git a/client/components/fonts/tahoma.ttf b/client/components/fonts/tahoma.ttf new file mode 100644 index 00000000..f5a011e9 Binary files /dev/null and b/client/components/fonts/tahoma.ttf differ diff --git a/client/components/fonts/tahoma.woff b/client/components/fonts/tahoma.woff new file mode 100644 index 00000000..55b0d201 Binary files /dev/null and b/client/components/fonts/tahoma.woff differ