From b1f4369a409faa360ff05f9b75e09a594fade42a Mon Sep 17 00:00:00 2001 From: Angelia Date: Tue, 28 Jul 2020 18:02:25 +0800 Subject: [PATCH] feat(gloabl): change global theme (#29) Co-authored-by: Angelia --- components/styles/themes/dark.ts | 21 ++++++++++----------- components/styles/themes/default.ts | 21 ++++++++++----------- components/styles/themes/index.ts | 19 +++++++++---------- lib/components/customization/editor.tsx | 19 +++++++++---------- 4 files changed, 38 insertions(+), 42 deletions(-) diff --git a/components/styles/themes/dark.ts b/components/styles/themes/dark.ts index 8c37da1fc..a4df3ca2e 100644 --- a/components/styles/themes/dark.ts +++ b/components/styles/themes/dark.ts @@ -52,18 +52,17 @@ export const palette: ZeitUIThemesPalette = { cTheme5: '#0054fe', cTheme6: '#0433dc', cTheme7: '#0626ae', - cBlack0: '#282d30', - cGray0: '#f9fafb', - cGray1: '#f1f3f6', - cGray2: '#ebeced', - cGray3: '#dbdde0', - cGray4: '#aaafbb', - cGray5: '#9b9eac', - cGray6: '#444', + cBlack0: '#000', cWhite0: '#fff', - brandLight: '#001b36', - brand: '#0054fe', - brandDark: '#0626ae', + cNeutral0: '#f9fafb', + cNeutral1: '#f1f3f6', + cNeutral2: '#ebeced', + cNeutral3: '#dbdde0', + cNeutral4: '#aaafbb', + cNeutral5: '#9b9eac', + cNeutral6: '#444', + cNeutral7: '#282d30', + cNeutral8: '#fdfdfe', } export const expressiveness: ZeitUIThemesExpressiveness = { diff --git a/components/styles/themes/default.ts b/components/styles/themes/default.ts index 9f8705b54..6470f34e7 100644 --- a/components/styles/themes/default.ts +++ b/components/styles/themes/default.ts @@ -52,18 +52,17 @@ export const palette: ZeitUIThemesPalette = { cTheme5: '#0054fe', cTheme6: '#0433dc', cTheme7: '#0626ae', - cBlack0: '#282D30', - cGray0: '#f9fafb', - cGray1: '#f1f3f6', - cGray2: '#ebeced', - cGray3: '#dbdde0', - cGray4: '#aaafbb', - cGray5: '#9b9eac', - cGray6: '#444', + cBlack0: '#000', cWhite0: '#fff', - brandLight: '#c0d8fc', - brand: '#0054fe', - brandDark: '#0626ae', + cNeutral0: '#f9fafb', + cNeutral1: '#f1f3f6', + cNeutral2: '#ebeced', + cNeutral3: '#dbdde0', + cNeutral4: '#aaafbb', + cNeutral5: '#9b9eac', + cNeutral6: '#444', + cNeutral7: '#282d30', + cNeutral8: '#fdfdfe', } export const expressiveness: ZeitUIThemesExpressiveness = { diff --git a/components/styles/themes/index.ts b/components/styles/themes/index.ts index 25d2d1c62..63bd8c0c2 100644 --- a/components/styles/themes/index.ts +++ b/components/styles/themes/index.ts @@ -52,17 +52,16 @@ export interface ZeitUIThemesPalette { cTheme6: string cTheme7: string cBlack0: string - cGray0: string - cGray1: string - cGray2: string - cGray3: string - cGray4: string - cGray5: string - cGray6: string cWhite0: string - brandLight: string - brand: string - brandDark: string + cNeutral0: string + cNeutral1: string + cNeutral2: string + cNeutral3: string + cNeutral4: string + cNeutral5: string + cNeutral6: string + cNeutral7: string + cNeutral8: string } export interface ZeitUIThemesExpressiveness { diff --git a/lib/components/customization/editor.tsx b/lib/components/customization/editor.tsx index 0480ac9c5..715dae18c 100644 --- a/lib/components/customization/editor.tsx +++ b/lib/components/customization/editor.tsx @@ -13,9 +13,6 @@ import DefaultTheme from 'components/styles/themes/default' import { useConfigs } from 'lib/config-context' const basicColors: Array = [ - 'brandLight', - 'brand', - 'brandDark', 'cTheme0', 'cTheme1', 'cTheme2', @@ -25,14 +22,16 @@ const basicColors: Array = [ 'cTheme6', 'cTheme7', 'cBlack0', - 'cGray0', - 'cGray1', - 'cGray2', - 'cGray3', - 'cGray4', - 'cGray5', - 'cGray6', 'cWhite0', + 'cNeutral0', + 'cNeutral1', + 'cNeutral2', + 'cNeutral3', + 'cNeutral4', + 'cNeutral5', + 'cNeutral6', + 'cNeutral7', + 'cNeutral8', 'accents_1', 'accents_2', 'accents_3',