Merge branch 'release/0.5.5'

client/components/Reader/LoaderPage/LoaderPage.vue

@@ -2,9 +2,10 @@
     <div ref="main" class="main">
         <div class="part">
             <span class="greeting bold-font">{{ title }}</span>
+            <div class="space"></div>
             <span class="greeting">Добро пожаловать!</span>
             <span class="greeting">Поддерживаются форматы: <b>fb2, html, txt</b> и сжатие: <b>zip, bz2, gz</b></span>
-            <span v-if="isExternalConverter" class="greeting">...а также: <b>rtf, doc, docx, pdf, epub, mobi</b></span>
+            <span v-if="isExternalConverter" class="greeting">...а также форматы: <b>rtf, doc, docx, pdf, epub, mobi</b></span>
         </div>
 
         <div class="part center">
@@ -129,6 +130,7 @@ class LoaderPage extends Vue {
     flex: 1;
     display: flex;
     flex-direction: column;
+    min-height: 340px;
 }
 
 .part {
@@ -140,8 +142,8 @@ class LoaderPage extends Vue {
 }
 
 .greeting {
-    font-size: 130%;
-    line-height: 170%;
+    font-size: 120%;
+    line-height: 160%;
 }
 
 .bold-font {

client/components/Reader/SettingsPage/SettingsPage.vue

@@ -251,7 +251,7 @@
                         <el-form :model="form" size="mini" label-width="120px" @submit.native.prevent>
                             <div class="partHeader">Анимация</div>
 
-                            <el-form-item label="Вид">
+                            <el-form-item label="Тип">
                                 <el-col :span="11">
                                     <el-select v-model="pageChangeAnimation">
                                         <el-option label="Нет" value=""></el-option>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "engines": {
     "node": ">=10.0.0"
   },

server/core/BookConverter/ConvertPdf.js

@@ -43,6 +43,7 @@ class ConvertPdf extends ConvertHtml {
         let title = '';
         let prevTop = 0;
         let i = -1;
+        let titleCount = 0;
 
         const loadImage = async(image) => {
             const src = path.parse(image.src);
@@ -76,8 +77,10 @@ class ConvertPdf extends ConvertHtml {
                 tClose += (bold ? '</b>' : '');
 
                 lines[i].text += `${tOpen}${text}${tClose} `;
-                if (i < 2)
-                    title += text + ' ';
+                if (titleCount < 2 && text.trim() != '') {
+                    title += text + (titleCount ? '' : ' - ');
+                    titleCount++;
+                }
             }
         };