fix(eink): adjust sidebar and notebook background color for eink, closes #2497 (#2529)

This commit is contained in:
Huang Xin
2025-11-24 16:56:26 +08:00
committed by GitHub
parent 72d9698f38
commit b7864dded2
2 changed files with 15 additions and 5 deletions
@@ -201,15 +201,20 @@ const Notebook: React.FC = ({}) => {
return isNotebookVisible ? (
<>
{!isNotebookPinned && (
<Overlay className='z-[45] bg-black/20' onDismiss={handleClickOverlay} />
<Overlay
className={clsx('z-[45]', viewSettings?.isEink ? '' : 'bg-black/20')}
onDismiss={handleClickOverlay}
/>
)}
<div
className={clsx(
'notebook-container bg-base-200 right-0 flex min-w-60 select-none flex-col',
'notebook-container right-0 flex min-w-60 select-none flex-col',
'font-sans text-base font-normal sm:text-sm',
viewSettings?.isEink ? 'bg-base-100' : 'bg-base-200',
appService?.isIOSApp ? 'h-[100vh]' : 'h-full',
appService?.hasRoundedWindow && 'rounded-window-top-right rounded-window-bottom-right',
isNotebookPinned ? 'z-20' : 'z-[45] shadow-2xl',
!isNotebookPinned && viewSettings?.isEink && 'border-base-content border-s',
)}
role='group'
aria-label={_('Notebook')}
@@ -206,15 +206,20 @@ const SideBar: React.FC<{
return isSideBarVisible ? (
<>
{!isSideBarPinned && (
<Overlay className='z-[45] bg-black/50 sm:bg-black/20' onDismiss={handleClickOverlay} />
<Overlay
className={clsx('z-[45]', viewSettings?.isEink ? '' : 'bg-black/50 sm:bg-black/20')}
onDismiss={handleClickOverlay}
/>
)}
<div
className={clsx(
'sidebar-container bg-base-200 flex min-w-60 select-none flex-col',
appService?.isIOSApp ? 'h-[100vh]' : 'h-full',
'sidebar-container flex min-w-60 select-none flex-col',
'transition-[padding-top] duration-300',
viewSettings?.isEink ? 'bg-base-100' : 'bg-base-200',
appService?.isIOSApp ? 'h-[100vh]' : 'h-full',
appService?.hasRoundedWindow && 'rounded-window-top-left rounded-window-bottom-left',
isSideBarPinned ? 'z-20' : 'z-[45] shadow-2xl',
!isSideBarPinned && viewSettings?.isEink && 'border-base-content border-e',
)}
role='group'
aria-label={_('Sidebar')}