From 2006baac4b85ed8eb3ee14f431d2818e17b21f9d Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Thu, 8 May 2025 01:56:14 +0800 Subject: [PATCH] revert: unbreak style overriding, closes #1058 and closes #1075 (#1091) --- apps/readest-app/src/utils/style.ts | 4 +++- packages/foliate-js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/readest-app/src/utils/style.ts b/apps/readest-app/src/utils/style.ts index 68bfcb60..b6870dad 100644 --- a/apps/readest-app/src/utils/style.ts +++ b/apps/readest-app/src/utils/style.ts @@ -210,6 +210,8 @@ const getLayoutStyles = ( ${writingMode === 'auto' ? '' : `writing-mode: ${writingMode} !important;`} text-align: var(--default-text-align); max-height: unset; + } + html { background-color: var(--theme-bg-color, transparent); background: var(--background-set, none); } @@ -223,7 +225,7 @@ const getLayoutStyles = ( svg, img { background-color: transparent !important; } - p:not(.poem):not(.poetry):not(.lh):not(:has(> :is(img, video, font, b, h1, h2, h3, h4, h5, table))), li, blockquote, dd { + p, li, blockquote, dd { line-height: ${lineSpacing} ${overrideLayout ? '!important' : ''}; word-spacing: ${wordSpacing}px ${overrideLayout ? '!important' : ''}; letter-spacing: ${letterSpacing}px ${overrideLayout ? '!important' : ''}; diff --git a/packages/foliate-js b/packages/foliate-js index 6f69a365..89285c2c 160000 --- a/packages/foliate-js +++ b/packages/foliate-js @@ -1 +1 @@ -Subproject commit 6f69a365b81c749f740b921ca31556adf09c497d +Subproject commit 89285c2cd49716204e9481811301d6daf1362e44