diff --git a/src/routers/layout/header.tsx b/src/routers/layout/header.tsx index 294aae3..d9dc4da 100644 --- a/src/routers/layout/header.tsx +++ b/src/routers/layout/header.tsx @@ -26,18 +26,19 @@ const ReactiveHeader = memo(() => { return (
{/* 手机端 */} -
+
+ {/* pc端和平板端header部 */} -
+
-
+
敬请期待
diff --git a/src/routers/layout/index.tsx b/src/routers/layout/index.tsx index dc59ab5..6d07e42 100644 --- a/src/routers/layout/index.tsx +++ b/src/routers/layout/index.tsx @@ -35,5 +35,5 @@ export default function Layout() { const NavContent = () => { const isSearchPage = useMatch(`/search`) !== null; - return
{!isSearchPage && }
; + return
{!isSearchPage && }
; }; diff --git a/src/routers/layout/logo/index.tsx b/src/routers/layout/logo/index.tsx index dfab803..26eb4fd 100644 --- a/src/routers/layout/logo/index.tsx +++ b/src/routers/layout/logo/index.tsx @@ -3,6 +3,7 @@ import { useState, useMemo, FC } from "react"; import { H1, Explain, Yituo } from "./modal"; import styles from "./logo.module.less"; import { Storage } from "../tools"; +import { useScreenSize } from "@components/proview/screenSize"; const QAStorage = new Storage("QAUpdate"); //暂时先这样 @@ -26,10 +27,12 @@ export default function LOGO() { set((open) => !open); handlerReadedNews(); }; + const { md } = useScreenSize(); return (
-

- EOEfans-web端 + +

+ {!md ? `EOEfans-web端` : `EOEfans`}

-

); } diff --git a/src/routers/layout/logo/logo.module.less b/src/routers/layout/logo/logo.module.less index 6a7fd62..50f5a88 100644 --- a/src/routers/layout/logo/logo.module.less +++ b/src/routers/layout/logo/logo.module.less @@ -1,22 +1,19 @@ .logo { display: flex; align-items: center; - flex-flow: row-reverse nowrap; + flex-flow: row nowrap; padding: 5px 0; - justify-content: flex-end; + position: relative; a { color: inherit; text-decoration: none; } - - h1 { margin: 0; white-space: nowrap; position: relative; - padding-right: 30px; } } diff --git a/src/routers/layout/logo/modal.tsx b/src/routers/layout/logo/modal.tsx index 135c03a..91e51b3 100644 --- a/src/routers/layout/logo/modal.tsx +++ b/src/routers/layout/logo/modal.tsx @@ -27,7 +27,7 @@ export const Explain: FC<{ open: boolean; handlerClick: () => void }> = ( export const H1 = styled("h1")(({ theme }) => ({ fontSize: "24px", - [theme.breakpoints.down("sm")]: { + [theme.breakpoints.down("md")]: { fontSize: "15px", }, })); diff --git a/src/routers/layout/routernav/index.tsx b/src/routers/layout/routernav/index.tsx index feadc75..c05cd37 100644 --- a/src/routers/layout/routernav/index.tsx +++ b/src/routers/layout/routernav/index.tsx @@ -23,7 +23,7 @@ export default function RouterNav() {
-
+
-
+ {/* pc and pad */} +
+
); } diff --git a/src/routers/layout/search/pc/search.tsx b/src/routers/layout/search/pc/search.tsx index bfac52e..ec1307e 100644 --- a/src/routers/layout/search/pc/search.tsx +++ b/src/routers/layout/search/pc/search.tsx @@ -32,7 +32,7 @@ export default function Search() { onClick={!focused ? onFocus : undefined} className={`${styles["search-box"]} ${ focused ? styles["focus"] : "py-1" - } px-2 max-md:m-0 duration-300 max-md:flex-row-reverse relative`} + } duration-300 relative`} > {searchMode === "搜索tag" && ( <> @@ -62,7 +62,7 @@ export default function Search() { const SearchButton: FC<{ onSubmit?: () => void }> = ({ onSubmit }) => (