ソースを参照

Поправки webFonts

Book Pauk 6 年 前
コミット
52a96a8ff2

+ 14 - 7
client/components/Reader/SettingsPage/SettingsPage.vue

@@ -40,13 +40,20 @@
                                          
                                          
                                     </el-col>
                                     </el-col>
                                     <el-col :span="10">
                                     <el-col :span="10">
-                                        <el-select v-model="webFontName">
-                                            <el-option label="Нет" value=""></el-option>
-                                            <el-option v-for="item in webFonts"
-                                                :key="item.name"
-                                                :value="item.name">
-                                            </el-option>
-                                        </el-select>
+                                        <el-tooltip :open-delay="500" effect="light">
+                                            <template slot="content">
+                                                Веб шрифты дают большое разнообразие,<br>
+                                                однако есть шанс, что шрифт будет загружаться<br>
+                                                очень медленно или вовсе не загрузится
+                                            </template>
+                                            <el-select v-model="webFontName">
+                                                <el-option label="Нет" value=""></el-option>
+                                                <el-option v-for="item in webFonts"
+                                                    :key="item.name"
+                                                    :value="item.name">
+                                                </el-option>
+                                            </el-select>
+                                        </el-tooltip>
                                     </el-col>
                                     </el-col>
                             </el-form-item>
                             </el-form-item>
                             <el-form-item label="Размер">
                             <el-form-item label="Размер">

+ 2 - 2
client/store/modules/reader.js

@@ -11,10 +11,10 @@ const fonts = [
 ];
 ];
 
 
 const webFonts = [
 const webFonts = [
-    {css: 'https://fonts.googleapis.com/css?family=Oswald', name: 'Oswald', fontVertShift: -20},
+    {css: 'https://fonts.googleapis.com/css?family=Comfortaa', name: 'Comfortaa', fontVertShift: 10},
     {css: 'https://fonts.googleapis.com/css?family=Lobster', name: 'Lobster', fontVertShift: 0},
     {css: 'https://fonts.googleapis.com/css?family=Lobster', name: 'Lobster', fontVertShift: 0},
+    {css: 'https://fonts.googleapis.com/css?family=Oswald', name: 'Oswald', fontVertShift: -20},
     {css: 'https://fonts.googleapis.com/css?family=Pacifico', name: 'Pacifico', fontVertShift: -40},
     {css: 'https://fonts.googleapis.com/css?family=Pacifico', name: 'Pacifico', fontVertShift: -40},
-    {css: 'https://fonts.googleapis.com/css?family=Comfortaa', name: 'Comfortaa', fontVertShift: 10},
     
     
 ];
 ];