diff --git a/README.md b/README.md index 4b6bdb2d..39bf2787 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ -
- +
+

@@ -34,7 +34,7 @@ ## Feature -Format support: **epub**, **pdf**, **mobi**, **azw3**, **txt**, **markdown**, **djvu**, **docx**, **rtf**, **cbz**, **cbr**, **cbt**, **fb2**, **html** and **xml** +Format support: **epub**, **pdf**, **mobi**, **azw3**, **txt**, **md**, **djvu**, **docx**, **rtf**, **cbz**, **cbr**, **cbt**, **fb2**, **html** and **xml** Platform support: **Windows** , **macOS**, **Linux** and **Web** @@ -52,7 +52,7 @@ Origanize your books and notes with shelf and tag Adjust font size, font family, line-spacing, paragraph spacing, background color, text color, margins, and brightness -Night mode and Theme color +Night mode and theme color Text highlight, underline, boldness, italics and shadow diff --git a/README_cn.md b/README_cn.md index f6e096f8..3492ffac 100644 --- a/README_cn.md +++ b/README_cn.md @@ -4,8 +4,8 @@

-
- +
+

@@ -34,7 +34,7 @@ ## 特色 -支持阅读 **epub**, **pdf**, **mobi**, **azw3**, **txt**, **markdown**, **djvu**, **docx**, **rtf**, **cbz**, **cbr**, **cbt**, **fb2**, **html** 和 **xml** 格式的图书 +支持阅读 **epub**, **pdf**, **mobi**, **azw3**, **txt**, **md**, **djvu**, **docx**, **rtf**, **cbz**, **cbr**, **cbt**, **fb2**, **html** 和 **xml** 格式的图书 支持 **Windows**,**macOS**,**Linux** 和 **网页版** diff --git a/README_tw.md b/README_tw.md index cb35ef2b..1fa629f7 100644 --- a/README_tw.md +++ b/README_tw.md @@ -4,8 +4,8 @@

-
- +
+

@@ -34,7 +34,7 @@ ## 特色 -支持閱讀 **epub**, **pdf**, **mobi**, **azw3**, **txt**, **markdown**, **djvu**, **docx**, **rtf**, **cbz**, **cbr**, **cbt**, **fb2**, **html** 和 **xml** 格式的圖書 +支持閱讀 **epub**, **pdf**, **mobi**, **azw3**, **txt**, **md**, **djvu**, **docx**, **rtf**, **cbz**, **cbr**, **cbt**, **fb2**, **html** 和 **xml** 格式的圖書 支持 **Windows**,**macOS**,**Linux** 和**網頁版** diff --git a/appveyor.yml b/appveyor.yml index a65551d9..fabfa951 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,20 +7,14 @@ branches: image: - Visual Studio 2019 - macos - - Ubuntu + - Ubuntu2004 stack: node 10 -cache: - - node_modules - - '%APPDATA%\npm-cache' - - '%USERPROFILE%\.electron' - - '%USERPROFILE%\AppData\Local\Yarn\cache' - init: - git config --global core.autocrlf input - sh: | - if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" == "Ubuntu" ] + if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" == "Ubuntu2004" ] then sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils sudo apt-get install snapd diff --git a/main.js b/main.js index ab37c549..2277f87b 100644 --- a/main.js +++ b/main.js @@ -1,4 +1,4 @@ -const { app, BrowserWindow, dialog, shell } = require("electron"); +const { app, BrowserWindow } = require("electron"); const { ebtMain } = require("electron-baidu-tongji"); let mainWin; @@ -112,16 +112,10 @@ app.on("ready", () => { readerWindow = null; }); }); - ipcMain.on("fonts-ready", (event, arg) => { + ipcMain.handle("fonts-ready", async (event, arg) => { const fontList = require("font-list"); - fontList - .getFonts({ disableQuoting: true }) - .then((fonts) => { - event.returnValue = fonts; - }) - .catch((err) => { - console.log(err); - }); + const fonts = await fontList.getFonts({ disableQuoting: true }); + return fonts; }); ipcMain.on("storage-location", (event, arg) => { diff --git a/package.json b/package.json index bc87389f..0d71abf2 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "copy-text-to-clipboard": "^2.2.0", "electron-baidu-tongji": "^1.0.5", "electron-is-dev": "^1.1.0", - "font-list": "^1.2.15", + "font-list": "1.2.15", "fs-extra": "^9.1.0", "i18next": "^20.2.4", "iconv-lite": "^0.6.2", diff --git a/public/assets/styles/default.css b/public/assets/styles/default.css index 1b7f8989..bd4e34d8 100644 --- a/public/assets/styles/default.css +++ b/public/assets/styles/default.css @@ -167,7 +167,8 @@ textarea::-ms-input-placeholder, .message-box-container { box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.3); } -::-webkit-scrollbar { +::-webkit-scrollbar, +.tag-list-item { background-color: white; } .add-bookmark-button, diff --git a/public/index.html b/public/index.html index 53752649..b8b72061 100644 --- a/public/index.html +++ b/public/index.html @@ -20,133 +20,12 @@ height: 100%; width: 100%; } - .loading-cover { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - } - .logo-container { - width: 200px; - } - .loading-cover img { - width: 80px; - position: relative; - left: 50%; - top: 50%; - margin-left: -40px; - margin-top: -80px; - } - .cover-spinner { - position: absolute; - left: 50%; - top: 50%; - margin-left: -15px; - margin-top: 40px; - } - .sk-chase { - width: 30px; - height: 30px; - animation: sk-chase 2.5s infinite linear both; - z-index: 20; - } - - .sk-chase-dot { - width: 100%; - height: 100%; - position: absolute; - left: 0; - top: 0; - animation: sk-chase-dot 2s infinite ease-in-out both; - } - - .sk-chase-dot:before { - content: ""; - display: block; - width: 25%; - height: 25%; - border-radius: 100%; - animation: sk-chase-dot-before 2s infinite ease-in-out both; - } - - .sk-chase-dot:nth-child(1) { - animation-delay: -1.1s; - } - .sk-chase-dot:nth-child(2) { - animation-delay: -1s; - } - .sk-chase-dot:nth-child(3) { - animation-delay: -0.9s; - } - .sk-chase-dot:nth-child(4) { - animation-delay: -0.8s; - } - .sk-chase-dot:nth-child(5) { - animation-delay: -0.7s; - } - .sk-chase-dot:nth-child(6) { - animation-delay: -0.6s; - } - .sk-chase-dot:nth-child(1):before { - animation-delay: -1.1s; - } - .sk-chase-dot:nth-child(2):before { - animation-delay: -1s; - } - .sk-chase-dot:nth-child(3):before { - animation-delay: -0.9s; - } - .sk-chase-dot:nth-child(4):before { - animation-delay: -0.8s; - } - .sk-chase-dot:nth-child(5):before { - animation-delay: -0.7s; - } - .sk-chase-dot:nth-child(6):before { - animation-delay: -0.6s; - } - - @keyframes sk-chase { - 100% { - transform: rotate(360deg); - } - } - - @keyframes sk-chase-dot { - 80%, - 100% { - transform: rotate(360deg); - } - } - - @keyframes sk-chase-dot-before { - 50% { - transform: scale(0.4); - } - 100%, - 0% { - transform: scale(1); - } - } Koodo Reader -
- -
-
-
-
-
-
-
-
-
-
-
+