diff --git a/src/alf/themes.ts b/src/alf/themes.ts index 614bab66f1..a4fe02fc1c 100644 --- a/src/alf/themes.ts +++ b/src/alf/themes.ts @@ -1,15 +1,15 @@ import * as tokens from '#/alf/tokens' import type {Mutable} from '#/alf/types' -export type ThemeName = 'light' | 'dark' +export type ThemeName = 'light' | 'dim' | 'dark' export type ReadonlyTheme = typeof light export type Theme = Mutable export type ReadonlyPalette = typeof lightPalette export type Palette = Mutable export const lightPalette = { - white: tokens.color.white, - black: tokens.color.black, + white: '#FFFFFF', + black: '#080B12', primary: tokens.color.blue_500, positive: tokens.color.green_500, negative: tokens.color.red_500, @@ -28,8 +28,8 @@ export const lightPalette = { } as const export const darkPalette: Palette = { - white: tokens.color.white, - black: tokens.color.black, + white: '#FFFFFF', + black: '#080B12', primary: tokens.color.blue_500, positive: tokens.color.green_500, negative: tokens.color.red_500, @@ -64,10 +64,10 @@ export const light = { color: lightPalette.contrast_400, }, text_inverted: { - color: tokens.color.white, + color: lightPalette.white, }, bg: { - backgroundColor: tokens.color.white, + backgroundColor: lightPalette.white, }, bg_contrast_25: { backgroundColor: lightPalette.contrast_25, @@ -85,10 +85,56 @@ export const light = { backgroundColor: lightPalette.contrast_300, }, border: { - borderColor: tokens.color.gray_200, + borderColor: lightPalette.contrast_100, }, - border_contrast_500: { - borderColor: tokens.color.gray_500, + border_contrast: { + borderColor: lightPalette.contrast_400, + }, + }, +} + +export const dim: Theme = { + name: 'dim', + palette: darkPalette, + atoms: { + text: { + color: darkPalette.white, + }, + text_contrast_600: { + color: darkPalette.contrast_600, + }, + text_contrast_500: { + color: darkPalette.contrast_500, + }, + text_contrast_400: { + color: darkPalette.contrast_400, + }, + text_inverted: { + color: darkPalette.contrast_900, + }, + bg: { + backgroundColor: darkPalette.contrast_25, + }, + bg_contrast_25: { + backgroundColor: darkPalette.contrast_50, + }, + bg_contrast_50: { + backgroundColor: darkPalette.contrast_100, + }, + bg_contrast_100: { + backgroundColor: darkPalette.contrast_200, + }, + bg_contrast_200: { + backgroundColor: darkPalette.contrast_300, + }, + bg_contrast_300: { + backgroundColor: darkPalette.contrast_400, + }, + border: { + borderColor: darkPalette.contrast_50, + }, + border_contrast: { + borderColor: darkPalette.contrast_300, }, }, } @@ -98,7 +144,7 @@ export const dark: Theme = { palette: darkPalette, atoms: { text: { - color: tokens.color.white, + color: darkPalette.white, }, text_contrast_600: { color: darkPalette.contrast_600, @@ -113,7 +159,7 @@ export const dark: Theme = { color: tokens.color.gray_900, }, bg: { - backgroundColor: tokens.color.gray_900, + backgroundColor: darkPalette.black, }, bg_contrast_25: { backgroundColor: darkPalette.contrast_25, @@ -131,10 +177,10 @@ export const dark: Theme = { backgroundColor: darkPalette.contrast_300, }, border: { - borderColor: tokens.color.gray_800, + borderColor: darkPalette.contrast_50, }, - border_contrast_500: { - borderColor: tokens.color.gray_500, + border_contrast: { + borderColor: darkPalette.contrast_300, }, }, } diff --git a/src/alf/tokens.ts b/src/alf/tokens.ts index 34bef53bd7..35189e7b88 100644 --- a/src/alf/tokens.ts +++ b/src/alf/tokens.ts @@ -1,7 +1,4 @@ export const color = { - white: '#FFFFFF', - black: '#000000', - gray_25: `#FCFCFD`, gray_50: `#F9FAFB`, gray_100: `#F3F4F6`, diff --git a/src/view/com/forms/InputDate/index.android.tsx b/src/view/com/forms/InputDate/index.android.tsx index 13b1ac25d2..9d80ba38a5 100644 --- a/src/view/com/forms/InputDate/index.android.tsx +++ b/src/view/com/forms/InputDate/index.android.tsx @@ -52,7 +52,7 @@ export function InputDate({ if (focused) { input.push({ - borderColor: t.atoms.border_contrast_500.borderColor, + borderColor: t.atoms.border_contrast.borderColor, }) if (hasError) { @@ -130,7 +130,7 @@ export function InputDate({ ]}> - + diff --git a/src/view/screens/Storybook/index.tsx b/src/view/screens/Storybook/index.tsx index 642eae9f7f..3724154c00 100644 --- a/src/view/screens/Storybook/index.tsx +++ b/src/view/screens/Storybook/index.tsx @@ -52,6 +52,9 @@ export function Storybook() { + + +