From 55a3bc9cd34ed16aa778c6faadb73906c4b6f10a Mon Sep 17 00:00:00 2001 From: ezequielnick <107352853+ezequielnick@users.noreply.github.com> Date: Sat, 8 Feb 2025 14:28:40 +0800 Subject: [PATCH] fix: guide page display issue --- src/renderer/src/App.tsx | 8 +++----- src/renderer/src/assets/main.css | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx index a2dc6ba..de19b56 100644 --- a/src/renderer/src/App.tsx +++ b/src/renderer/src/App.tsx @@ -80,13 +80,11 @@ const App: React.FC = () => { const location = useLocation() const page = useRoutes(routes) const setTitlebar = (): void => { - if (!useWindowFrame) { + if (!useWindowFrame && platform !== 'darwin') { const options = { height: 48 } as TitleBarOverlayOptions try { - if (platform !== 'darwin') { - options.color = window.getComputedStyle(document.documentElement).backgroundColor - options.symbolColor = window.getComputedStyle(document.documentElement).color - } + options.color = window.getComputedStyle(document.documentElement).backgroundColor + options.symbolColor = window.getComputedStyle(document.documentElement).color setTitleBarOverlay(options) } catch (e) { // ignore diff --git a/src/renderer/src/assets/main.css b/src/renderer/src/assets/main.css index a56027c..eb3ae3e 100644 --- a/src/renderer/src/assets/main.css +++ b/src/renderer/src/assets/main.css @@ -8,22 +8,22 @@ } .driver-popover { - background-color: hsl(var(--nextui-content2)) !important; + background-color: hsl(var(--heroui-content2)) !important; border-radius: 8px !important; - color: hsl(var(--nextui-foreground)) !important; + color: hsl(var(--heroui-foreground)) !important; } .driver-popover a { - color: hsl(var(--nextui-primary)) !important; + color: hsl(var(--heroui-primary)) !important; text-decoration: underline !important; } .driver-popover-close-btn { - color: hsl(var(--nextui-foreground)) !important; + color: hsl(var(--heroui-foreground)) !important; } .driver-popover-progress-text { - color: hsl(var(--nextui-default-500)) !important; + color: hsl(var(--heroui-default-500)) !important; } .driver-popover-prev-btn { @@ -33,7 +33,7 @@ padding: 8px !important; border-radius: 5px !important; font-size: 12px !important; - background-color: hsl(var(--nextui-primary)) !important; + background-color: hsl(var(--heroui-primary)) !important; } .driver-popover-next-btn { @@ -43,23 +43,23 @@ padding: 8px !important; border-radius: 5px !important; font-size: 12px !important; - background-color: hsl(var(--nextui-primary)) !important; + background-color: hsl(var(--heroui-primary)) !important; } .driver-popover-arrow-side-bottom { - border-bottom-color: hsl(var(--nextui-content2)) !important; + border-bottom-color: hsl(var(--heroui-content2)) !important; } .driver-popover-arrow-side-top { - border-top-color: hsl(var(--nextui-content2)) !important; + border-top-color: hsl(var(--heroui-content2)) !important; } .driver-popover-arrow-side-left { - border-left-color: hsl(var(--nextui-content2)) !important; + border-left-color: hsl(var(--heroui-content2)) !important; } .driver-popover-arrow-side-right { - border-right-color: hsl(var(--nextui-content2)) !important; + border-right-color: hsl(var(--heroui-content2)) !important; } .app-nodrag {