Просмотр исходного кода

Добавил шрифты в читалку

Book Pauk 6 лет назад
Родитель
Сommit
48808df3df

+ 58 - 4
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');
+}
+
 </style>

+ 3 - 2
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, отступ параграфа

BIN
client/components/fonts/arial-narrow.ttf


BIN
client/components/fonts/arial-narrow.woff


BIN
client/components/fonts/arial.ttf


BIN
client/components/fonts/arial.woff


BIN
client/components/fonts/century-schoolbook.ttf


BIN
client/components/fonts/century-schoolbook.woff


BIN
client/components/fonts/comic-sans-ms.ttf


BIN
client/components/fonts/comic-sans-ms.woff


BIN
client/components/fonts/georgia.ttf


BIN
client/components/fonts/georgia.woff


BIN
client/components/fonts/helvetica.ttf


BIN
client/components/fonts/helvetica.woff


BIN
client/components/fonts/open-sans.ttf


BIN
client/components/fonts/open-sans.woff


BIN
client/components/fonts/reader-default.ttf


BIN
client/components/fonts/reader-default.woff


BIN
client/components/fonts/roboto.ttf


BIN
client/components/fonts/roboto.woff


BIN
client/components/fonts/tahoma.ttf


BIN
client/components/fonts/tahoma.woff