diff --git a/packages/frontend/component/package.json b/packages/frontend/component/package.json index 1aa131656ae7..04322483fc80 100644 --- a/packages/frontend/component/package.json +++ b/packages/frontend/component/package.json @@ -47,7 +47,7 @@ "@radix-ui/react-toolbar": "^1.0.4", "@radix-ui/react-tooltip": "^1.0.7", "@radix-ui/react-visually-hidden": "^1.1.0", - "@toeverything/theme": "^0.7.35", + "@toeverything/theme": "^1.0.0", "@vanilla-extract/dynamic": "^2.1.0", "bytes": "^3.1.2", "check-password-strength": "^2.0.10", diff --git a/packages/frontend/component/src/theme/global.css b/packages/frontend/component/src/theme/global.css index 69c2e7738b12..33b73419a7c5 100644 --- a/packages/frontend/component/src/theme/global.css +++ b/packages/frontend/component/src/theme/global.css @@ -1,4 +1,5 @@ @import './fonts.css'; +@import '@toeverything/theme/style.css'; * { -webkit-overflow-scrolling: touch; diff --git a/packages/frontend/component/src/theme/theme.css.ts b/packages/frontend/component/src/theme/theme.css.ts index 09c974a155fd..e44c4c749a94 100644 --- a/packages/frontend/component/src/theme/theme.css.ts +++ b/packages/frontend/component/src/theme/theme.css.ts @@ -1,20 +1,12 @@ -import { - cssVar, - darkCssVariables, - lightCssVariables, -} from '@toeverything/theme'; +import { cssVar } from '@toeverything/theme'; import { globalStyle } from '@vanilla-extract/css'; + globalStyle('body', { color: cssVar('textPrimaryColor'), fontFamily: cssVar('fontFamily'), fontSize: cssVar('fontBase'), }); -globalStyle('html', { - vars: lightCssVariables, -}); -globalStyle('html[data-theme="dark"]', { - vars: darkCssVariables, -}); + if (process.env.NODE_ENV === 'development') { globalStyle('.undefined', { border: '5px solid red !important', diff --git a/packages/frontend/core/package.json b/packages/frontend/core/package.json index 3e4b56eaad14..4e4499e5d9c6 100644 --- a/packages/frontend/core/package.json +++ b/packages/frontend/core/package.json @@ -48,7 +48,7 @@ "@sentry/integrations": "^7.109.0", "@sentry/react": "^8.0.0", "@sgtpooki/file-type": "^1.0.1", - "@toeverything/theme": "^0.7.35", + "@toeverything/theme": "^1.0.0", "@vanilla-extract/dynamic": "^2.1.0", "animejs": "^3.2.2", "async-call-rpc": "^6.4.2", diff --git a/yarn.lock b/yarn.lock index f0a66bb3899f..e5e1efddd08a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -324,7 +324,7 @@ __metadata: "@storybook/test-runner": "npm:^0.19.0" "@storybook/testing-library": "npm:^0.2.2" "@testing-library/react": "npm:^16.0.0" - "@toeverything/theme": "npm:^0.7.35" + "@toeverything/theme": "npm:^1.0.0" "@types/bytes": "npm:^3.1.4" "@types/react": "npm:^18.2.75" "@types/react-dnd": "npm:^3.0.2" @@ -419,7 +419,7 @@ __metadata: "@sgtpooki/file-type": "npm:^1.0.1" "@swc/core": "npm:^1.4.13" "@testing-library/react": "npm:^16.0.0" - "@toeverything/theme": "npm:^0.7.35" + "@toeverything/theme": "npm:^1.0.0" "@types/animejs": "npm:^3.1.12" "@types/bytes": "npm:^3.1.4" "@types/image-blob-reduce": "npm:^4.1.4" @@ -14928,6 +14928,13 @@ __metadata: languageName: node linkType: hard +"@toeverything/theme@npm:^1.0.0": + version: 1.0.0 + resolution: "@toeverything/theme@npm:1.0.0" + checksum: 10/9fe34e778bce0eec99163a45525d4547e5b4765600c74d4143d37a5683afeb3821fb7a44cbd84e0bd75f40f1e0b3b0bf19d76faaac91d3e29c75d812b81ef3ee + languageName: node + linkType: hard + "@tokenizer/token@npm:^0.3.0": version: 0.3.0 resolution: "@tokenizer/token@npm:0.3.0"