From b3c23cd1b5449706d75454e07c304eac296be6ca Mon Sep 17 00:00:00 2001 From: chrox Date: Wed, 20 Nov 2024 14:01:28 +0100 Subject: [PATCH] Various fix for theming --- apps/readest-app/src/app/layout.tsx | 8 ++++++++ .../src/app/library/components/Bookshelf.tsx | 7 +++++-- .../src/app/library/components/LibraryHeader.tsx | 2 +- apps/readest-app/src/app/library/page.tsx | 2 +- .../src/app/reader/components/ReaderContent.tsx | 2 +- apps/readest-app/src/app/reader/page.tsx | 2 +- apps/readest-app/src/styles/globals.css | 15 +++++---------- 7 files changed, 22 insertions(+), 16 deletions(-) diff --git a/apps/readest-app/src/app/layout.tsx b/apps/readest-app/src/app/layout.tsx index 69c53c2f..4a3deabd 100644 --- a/apps/readest-app/src/app/layout.tsx +++ b/apps/readest-app/src/app/layout.tsx @@ -16,6 +16,14 @@ export default function RootLayout({ children }: { children: React.ReactNode }) document.documentElement.setAttribute('data-page', pathname.replace('/', '') || 'default'); }, [pathname]); + React.useEffect(() => { + if (process.env['NODE_ENV'] === 'production') { + document.oncontextmenu = (event) => { + event.preventDefault(); + }; + } + }, []); + return ( diff --git a/apps/readest-app/src/app/library/components/Bookshelf.tsx b/apps/readest-app/src/app/library/components/Bookshelf.tsx index fdec9f33..182fa3a4 100644 --- a/apps/readest-app/src/app/library/components/Bookshelf.tsx +++ b/apps/readest-app/src/app/library/components/Bookshelf.tsx @@ -97,7 +97,10 @@ const Bookshelf: React.FC = ({ libraryBooks, isSelectMode, onImp
{bookshelfItems.map((item, index) => ( -
+
{'format' in item ? (
= ({ libraryBooks, isSelectMode, onImp {bookshelfItems.length > 0 && (
diff --git a/apps/readest-app/src/app/library/components/LibraryHeader.tsx b/apps/readest-app/src/app/library/components/LibraryHeader.tsx index eee7ed7c..499e9e43 100644 --- a/apps/readest-app/src/app/library/components/LibraryHeader.tsx +++ b/apps/readest-app/src/app/library/components/LibraryHeader.tsx @@ -66,7 +66,7 @@ const LibraryHeader: React.FC = ({ placeholder='Search books...' spellCheck='false' className={clsx( - 'input rounded-badge bg-base-200 h-7 w-full pl-10 pr-10', + 'input rounded-badge bg-base-300/50 h-7 w-full pl-10 pr-10', 'font-sans text-sm font-light', 'border-none focus:outline-none focus:ring-0', )} diff --git a/apps/readest-app/src/app/library/page.tsx b/apps/readest-app/src/app/library/page.tsx index a39fb805..5dbb0ac8 100644 --- a/apps/readest-app/src/app/library/page.tsx +++ b/apps/readest-app/src/app/library/page.tsx @@ -77,7 +77,7 @@ const LibraryPage = () => { } return ( -
+
= ({ settings }) => } return ( -
+
diff --git a/apps/readest-app/src/app/reader/page.tsx b/apps/readest-app/src/app/reader/page.tsx index d77d49b9..4d1fe1a4 100644 --- a/apps/readest-app/src/app/reader/page.tsx +++ b/apps/readest-app/src/app/reader/page.tsx @@ -30,7 +30,7 @@ const ReaderPage = () => { return ( library.length > 0 && settings.globalReadSettings && ( -
+
diff --git a/apps/readest-app/src/styles/globals.css b/apps/readest-app/src/styles/globals.css index db3316ee..9ca18950 100644 --- a/apps/readest-app/src/styles/globals.css +++ b/apps/readest-app/src/styles/globals.css @@ -5,9 +5,6 @@ :root { --background: #ffffff; --foreground: #171717; -} - -:root { border-radius: 10px; } @@ -18,22 +15,22 @@ } } -/* html[data-page="default"] { +html[data-page="default"] { background: #ffffff; } html[data-page="library"] { - background: #f3f4f6; + background: theme('colors.base-200'); } html[data-page="reader"] { - background: #f3f4f6; -} */ + background: theme('colors.base-100'); +} body { color: var(--foreground); background: var(--background); - font-family: Arial, Helvetica, sans-serif; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif; border-radius: 10px; background-color: transparent; } @@ -153,8 +150,6 @@ foliate-view { .dropdown-content, .settings-content { - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, - sans-serif; font-size: 14px; font-weight: 400; }