refactor: 整理全局样式相关代码

PKUHPC · Mar 7, 2023 · 4eb7396 · 4eb7396
1 parent 2af0b3b
commit 4eb7396
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 48 deletions.
diff --git a/apps/mis-web/src/pages/_app.tsx b/apps/mis-web/src/pages/_app.tsx
@@ -16,6 +16,7 @@ import "antd/dist/reset.css";
 import { failEvent, fromApi } from "@ddadaal/next-typed-api-routes-runtime/lib/client";
 import { AntdConfigProvider } from "@scow/lib-web/build/layouts/AntdConfigProvider";
 import { DarkModeProvider } from "@scow/lib-web/build/layouts/darkMode";
+import { GlobalStyle } from "@scow/lib-web/build/layouts/globalStyle";
 import { getHostname } from "@scow/lib-web/build/utils/getHostname";
 import { useConstant } from "@scow/lib-web/build/utils/hooks";
 import { isServer } from "@scow/lib-web/build/utils/isServer";
@@ -37,7 +38,6 @@ import { DefaultClusterStore } from "src/stores/DefaultClusterStore";
 import {
   User, UserStore,
 } from "src/stores/UserStore";
-import { GlobalStyle } from "src/styles/globalStyle";
 import { publicConfig, runtimeConfig } from "src/utils/config";
 
 const FailEventHandler: React.FC = () => {

diff --git a/apps/portal-web/src/pages/_app.tsx b/apps/portal-web/src/pages/_app.tsx
@@ -16,6 +16,7 @@ import "antd/dist/reset.css";
 import { failEvent, fromApi } from "@ddadaal/next-typed-api-routes-runtime/lib/client";
 import { AntdConfigProvider } from "@scow/lib-web/build/layouts/AntdConfigProvider";
 import { DarkModeProvider } from "@scow/lib-web/build/layouts/darkMode";
+import { GlobalStyle } from "@scow/lib-web/build/layouts/globalStyle";
 import { getHostname } from "@scow/lib-web/build/utils/getHostname";
 import { useConstant } from "@scow/lib-web/build/utils/hooks";
 import { isServer } from "@scow/lib-web/build/utils/isServer";
@@ -39,7 +40,6 @@ import { DefaultClusterStore } from "src/stores/DefaultClusterStore";
 import {
   User, UserStore,
 } from "src/stores/UserStore";
-import { GlobalStyle } from "src/styles/globalStyle";
 import { publicConfig, runtimeConfig } from "src/utils/config";
 
 

diff --git a/apps/portal-web/src/styles/globalStyle.ts b/apps/portal-web/src/styles/globalStyle.ts
diff --git a/libs/web/package.json b/libs/web/package.json
@@ -37,7 +37,8 @@
     "@types/react-dom": "18.0.11",
     "react-is": "18.2.0",
     "@ant-design/icons": "5.0.1",
-    "dayjs": "1.11.7"
+    "dayjs": "1.11.7",
+    "@types/styled-components": "5.1.26"
   },
   "author": "PKUHPC (https://github.com/PKUHPC)",
   "license": "Mulan PSL v2",

diff --git a/apps/mis-web/src/styles/globalStyle.ts → libs/web/src/layouts/globalStyle.tsx b/apps/mis-web/src/styles/globalStyle.ts → libs/web/src/layouts/globalStyle.tsx
@@ -19,8 +19,7 @@ export const GlobalStyle = createGlobalStyle`
 
  // HACK
   a {
-    color: ${({ theme }) => theme.token.colorPrimary};
+    color: ${({ theme }) => theme.token.colorPrimaryText};
   }
 `;
 
-
diff --git a/libs/web/src/layouts/icon.tsx b/libs/web/src/layouts/icon.tsx
@@ -12,7 +12,6 @@
 
 import AntdIcon from "@ant-design/icons";
 import Image from "next/image";
-import { useDarkMode } from "src/layouts/darkMode";
 import { addBasePathToImage } from "src/utils/image";
 
 interface Props {
@@ -23,8 +22,6 @@ interface Props {
 
 export function NavIcon({ src, alt, basePath = "" }: Props) {
 
-  const { dark } = useDarkMode();
-
   return (
     <AntdIcon
       component={({ width, height, style, className, fill }: any) => (

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,8 +19,7 @@ export const GlobalStyle = createGlobalStyle` @@
      // HACK
       a {
-        color: ${({ theme }) => theme.token.colorPrimary};
+        color: ${({ theme }) => theme.token.colorPrimaryText};
       }
     `;