Разборки со шрифтами
This commit is contained in:
@@ -281,11 +281,6 @@ body, html, #app {
|
|||||||
url('fonts/roboto.ttf') format('truetype');
|
url('fonts/roboto.ttf') format('truetype');
|
||||||
}
|
}
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Archivo';
|
|
||||||
src: url('fonts/archivo.woff2') format('woff2');
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Rubik';
|
font-family: 'Rubik';
|
||||||
src: url('fonts/rubik.woff2') format('woff2');
|
src: url('fonts/rubik.woff2') format('woff2');
|
||||||
@@ -297,4 +292,9 @@ body, html, #app {
|
|||||||
url('fonts/avrile.ttf') format('truetype');
|
url('fonts/avrile.ttf') format('truetype');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Arimo';
|
||||||
|
src: url('fonts/arimo.woff2') format('woff2');
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -102,9 +102,9 @@ class TextPage extends Vue {
|
|||||||
ReaderDefault: 0,
|
ReaderDefault: 0,
|
||||||
Roboto: 0,
|
Roboto: 0,
|
||||||
OpenSans: 0,
|
OpenSans: 0,
|
||||||
Archivo: 0,
|
|
||||||
Rubik: 0,
|
Rubik: 0,
|
||||||
Avrile: -10,
|
Avrile: -10,
|
||||||
|
Arimo: 0,
|
||||||
}
|
}
|
||||||
if (!this.fontShifts.hasOwnProperty(this.fontName))
|
if (!this.fontShifts.hasOwnProperty(this.fontName))
|
||||||
this.fontShifts[this.fontName] = this.fontVertShift;
|
this.fontShifts[this.fontName] = this.fontVertShift;
|
||||||
@@ -235,7 +235,7 @@ class TextPage extends Vue {
|
|||||||
this.backgroundColor = '#478355';
|
this.backgroundColor = '#478355';
|
||||||
this.fontStyle = '';// 'bold','italic'
|
this.fontStyle = '';// 'bold','italic'
|
||||||
this.fontSize = 35;// px
|
this.fontSize = 35;// px
|
||||||
this.fontName = 'Archivo';
|
this.fontName = 'Arimo';
|
||||||
this.fontCssUrl = '';
|
this.fontCssUrl = '';
|
||||||
this.fontVertShift = 0;
|
this.fontVertShift = 0;
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
BIN
client/components/fonts/arimo.woff2
Normal file
BIN
client/components/fonts/arimo.woff2
Normal file
Binary file not shown.
Reference in New Issue
Block a user