diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue index 684e0e73..3f2bedfb 100644 --- a/client/components/Reader/LoaderPage/LoaderPage.vue +++ b/client/components/Reader/LoaderPage/LoaderPage.vue @@ -2,9 +2,10 @@
{{ title }} +
Добро пожаловать! Поддерживаются форматы: fb2, html, txt и сжатие: zip, bz2, gz - ...а также: rtf, doc, docx, pdf, epub, mobi + ...а также форматы: rtf, doc, docx, pdf, epub, mobi
@@ -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 { diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue index 477ad5cb..e24ac197 100644 --- a/client/components/Reader/SettingsPage/SettingsPage.vue +++ b/client/components/Reader/SettingsPage/SettingsPage.vue @@ -251,7 +251,7 @@
Анимация
- + diff --git a/package.json b/package.json index 5e422b4c..7b58717c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Liberama", - "version": "0.5.4", + "version": "0.5.5", "engines": { "node": ">=10.0.0" }, diff --git a/server/core/BookConverter/ConvertPdf.js b/server/core/BookConverter/ConvertPdf.js index 967bcdaa..77f1142c 100644 --- a/server/core/BookConverter/ConvertPdf.js +++ b/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 ? '' : ''); lines[i].text += `${tOpen}${text}${tClose} `; - if (i < 2) - title += text + ' '; + if (titleCount < 2 && text.trim() != '') { + title += text + (titleCount ? '' : ' - '); + titleCount++; + } } };