diff --git a/src/assets/styles/layout.scss b/src/assets/styles/layout.scss index e75887f955f7b108ea6cd742c92c7701d4064e32..171a78c46e45f81de11168fccb7747b738cb51fa 100644 --- a/src/assets/styles/layout.scss +++ b/src/assets/styles/layout.scss @@ -72,7 +72,7 @@ .the-content { position: absolute; - top: 30px; + top: 0; left: 0; right: 2px; bottom: 10px; @@ -80,8 +80,8 @@ } } -.macos.layout { +.windows.layout { .layout__right .the-content { - top: 0; + top: 30px; } } diff --git a/src/pages/_layout.tsx b/src/pages/_layout.tsx index b82c3d39bbe2539a512e8d374606254d34eeda6e..43bad1ce6ae589bf4e3f89a910f5c9e92ffc77b3 100644 --- a/src/pages/_layout.tsx +++ b/src/pages/_layout.tsx @@ -19,7 +19,8 @@ import UpdateButton from "../components/layout/update-button"; import "dayjs/locale/zh-cn"; dayjs.extend(relativeTime); -const isMacos = navigator.userAgent.includes("Mac OS X"); + +const isWinOs = /win64|win32/i.test(navigator.userAgent); const Layout = () => { const { t } = useTranslation(); @@ -81,7 +82,7 @@ const Layout = () => { <Paper square elevation={0} - className={`${isMacos ? "macos " : ""}layout`} + className={`${isWinOs ? "windows " : ""}layout`} onPointerDown={onDragging} sx={[ (theme) => ({ @@ -110,7 +111,7 @@ const Layout = () => { </div> <div className="layout__right" data-windrag> - {!isMacos && ( + {isWinOs && ( <div className="the-bar"> <LayoutControl /> </div>