From ed6c92a65a3c3f9e7222edfecddb84a4f94a2a8c Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Tue, 20 May 2025 21:11:36 +0800 Subject: [PATCH] css: don't override body background, closes #1206 (#1208) Revisit #1151. --- apps/readest-app/src/utils/style.ts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/apps/readest-app/src/utils/style.ts b/apps/readest-app/src/utils/style.ts index 8230df00..31675bb1 100644 --- a/apps/readest-app/src/utils/style.ts +++ b/apps/readest-app/src/utils/style.ts @@ -226,7 +226,7 @@ const getLayoutStyles = ( text-align: var(--default-text-align); max-height: unset; } - html, body { + html { background-color: var(--theme-bg-color, transparent); background: var(--background-set, none); } @@ -318,7 +318,7 @@ const getLayoutStyles = ( #pg-header * { color: inherit !important; } - .x-ebookmaker-cover { + .x-ebookmaker, .x-ebookmaker-cover, .x-ebookmaker-coverpage { background-color: unset !important; } @@ -507,13 +507,9 @@ export const transformStylesheet = ( return `font-size: ${rem}rem`; }) .replace(/(\d*\.?\d+)vw/gi, (_, d) => (parseFloat(d) * w) / 100 + 'px') - .replace(/(\d*\.?\d+)vh/gi, (_, d) => (parseFloat(d) * h) / 100 + 'px'); - - if (viewSettings.overrideFont) { - css = css - .replace(/[\s;]color\s*:\s*#000000/gi, 'color: var(--theme-fg-color)') - .replace(/[\s;]color\s*:\s*#000/gi, 'color: var(--theme-fg-color)') - .replace(/[\s;]color\s*:\s*rgb\(0,\s*0,\s*0\)/gi, 'color: var(--theme-fg-color)'); - } + .replace(/(\d*\.?\d+)vh/gi, (_, d) => (parseFloat(d) * h) / 100 + 'px') + .replace(/[\s;]color\s*:\s*#000000/gi, 'color: var(--theme-fg-color)') + .replace(/[\s;]color\s*:\s*#000/gi, 'color: var(--theme-fg-color)') + .replace(/[\s;]color\s*:\s*rgb\(0,\s*0,\s*0\)/gi, 'color: var(--theme-fg-color)'); return css; };