diff --git a/client/components/App.vue b/client/components/App.vue index 80802598..b6d01f64 100644 --- a/client/components/App.vue +++ b/client/components/App.vue @@ -291,4 +291,10 @@ body, html, #app { src: url('fonts/rubik.woff2') format('woff2'); } +@font-face { + font-family: 'Avrile'; + src: url('fonts/avrile.woff') format('woff'), + url('fonts/avrile.ttf') format('truetype'); +} + diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue index 48c4baea..5d060b94 100644 --- a/client/components/Reader/TextPage/TextPage.vue +++ b/client/components/Reader/TextPage/TextPage.vue @@ -101,10 +101,13 @@ class TextPage extends Vue { this.fontShifts = {//% ReaderDefault: 0, Roboto: 0, - OpenSans: 0 + OpenSans: 0, + Archivo: 0, + Rubik: 0, + Avrile: -10, } if (!this.fontShifts.hasOwnProperty(this.fontName)) - this.fontShifts[this.fontName] = 0; + this.fontShifts[this.fontName] = this.fontVertShift; this.fontList = []; for (let fontName in this.fontShifts) this.fontList.push(`12px ${fontName}`); @@ -234,6 +237,8 @@ class TextPage extends Vue { this.fontSize = 35;// px this.fontName = 'Archivo'; this.fontCssUrl = ''; + this.fontVertShift = 0; + this.lineInterval = 7;// px, межстрочный интервал this.textAlignJustify = true;// выравнивание по ширине this.p = 50;// px, отступ параграфа diff --git a/client/components/fonts/avrile.ttf b/client/components/fonts/avrile.ttf new file mode 100644 index 00000000..0413b378 Binary files /dev/null and b/client/components/fonts/avrile.ttf differ diff --git a/client/components/fonts/avrile.woff b/client/components/fonts/avrile.woff new file mode 100644 index 00000000..301d08ce Binary files /dev/null and b/client/components/fonts/avrile.woff differ