From dd3e3f56bf8e07054a245121673836930cf67e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E5=A3=B0?= Date: Thu, 22 Aug 2024 19:31:02 +0800 Subject: [PATCH 1/2] fix: check design theme type --- packages/core/src/core/style.module.less | 15 +++++++++++---- packages/sumi-core/src/common/theme.ts | 9 +++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/packages/core/src/core/style.module.less b/packages/core/src/core/style.module.less index 80b74d65..9b609d34 100644 --- a/packages/core/src/core/style.module.less +++ b/packages/core/src/core/style.module.less @@ -16,17 +16,24 @@ codeblitz-root { flex-direction: column; justify-content: center; align-items: center; - color: #4D4D4D; - background-color: #FFF; + color: var(--codeblitz-landing-color); + background-color: var(--codeblitz-landing-background); +} + +:root { + --codeblitz-landing-background-dark: #202224; + + --codeblitz-landing-background: #FFF; + --codeblitz-landing-color: #4D4D4D; } :global(.codeblitz-dark) .landing { color: #D7DBDE; - background-color: #202224; + background-color: var(--codeblitz-landing-background-dark); } :global(.codeblitz-dark) { - background-color: #202224; + background-color: var(--codeblitz-landing-background-dark); } .loading { diff --git a/packages/sumi-core/src/common/theme.ts b/packages/sumi-core/src/common/theme.ts index 76f73990..e54fb647 100644 --- a/packages/sumi-core/src/common/theme.ts +++ b/packages/sumi-core/src/common/theme.ts @@ -1,6 +1,11 @@ import { IExtensionBasicMetadata } from '@codeblitzjs/ide-common'; import { BuiltinTheme, getThemeId, getThemeType, IThemeContribution } from '@opensumi/ide-theme'; +const builtinTheme = { + "opensumi-design-dark-theme": "vs-dark", + "opensumi-design-light-theme": "vs", +} as Record + export const getThemeTypeByPreferenceThemeId = ( themeId: string, extensionMetadata: IExtensionBasicMetadata[] | undefined, @@ -18,5 +23,9 @@ export const getThemeTypeByPreferenceThemeId = ( } } } + if (builtinTheme[themeId]) { + uiTheme = builtinTheme[themeId]; + } + return getThemeType(uiTheme || 'vs-dark'); }; From 5ab5309957b8fd21353a91987c56f0e847bbab20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E5=A3=B0?= Date: Thu, 22 Aug 2024 19:36:36 +0800 Subject: [PATCH 2/2] chore: update css var name --- packages/core/src/core/style.module.less | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/core/src/core/style.module.less b/packages/core/src/core/style.module.less index 9b609d34..726690a4 100644 --- a/packages/core/src/core/style.module.less +++ b/packages/core/src/core/style.module.less @@ -16,24 +16,25 @@ codeblitz-root { flex-direction: column; justify-content: center; align-items: center; - color: var(--codeblitz-landing-color); + color: var(--codeblitz-landing-foreground); background-color: var(--codeblitz-landing-background); } :root { - --codeblitz-landing-background-dark: #202224; + --codeblitz-landing-dark-foreground: #D7DBDE; + --codeblitz-landing-dark-background: #202224; + --codeblitz-landing-foreground: #4D4D4D; --codeblitz-landing-background: #FFF; - --codeblitz-landing-color: #4D4D4D; -} - -:global(.codeblitz-dark) .landing { - color: #D7DBDE; - background-color: var(--codeblitz-landing-background-dark); } :global(.codeblitz-dark) { - background-color: var(--codeblitz-landing-background-dark); + background-color: var(--codeblitz-landing-dark-background); + + & .landing { + color: var(--codeblitz-landing-dark-foreground); + background-color: var(--codeblitz-landing-dark-background); + } } .loading {