diff options
author | Vijay A <avijayr@protonmail.com> | 2021-08-13 00:45:01 +0530 |
---|---|---|
committer | Vijay A <avijayr@protonmail.com> | 2021-08-13 00:45:01 +0530 |
commit | 2d27d5e66649d4f5baf127a53ee5ae524eae3a59 (patch) | |
tree | c592ea219ac8cd987fc367f57b54034c450ab2ab /packages/theme/src/index.ts | |
parent | Ferdi v5.6.0 (diff) | |
parent | 5.6.1-nightly.24 [skip ci] (diff) | |
download | ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.gz ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.zst ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.zip |
chore: merge from nightly branch into release branch in prep for next beta
Diffstat (limited to 'packages/theme/src/index.ts')
-rw-r--r-- | packages/theme/src/index.ts | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/packages/theme/src/index.ts b/packages/theme/src/index.ts index 78d1dcbb9..5ba225e51 100644 --- a/packages/theme/src/index.ts +++ b/packages/theme/src/index.ts | |||
@@ -1,19 +1,21 @@ | |||
1 | import makeDarkThemeConfig from './themes/dark'; | 1 | import makeDarkThemeConfig from './themes/dark'; |
2 | import makeDefaultThemeConfig from './themes/default'; | 2 | import makeDefaultThemeConfig from './themes/default'; |
3 | import * as legacyStyles from './themes/legacy'; | 3 | import { themeBrandPrimary } from './themes/legacy'; |
4 | 4 | ||
5 | export enum ThemeType { | 5 | export enum ThemeType { |
6 | default = 'default', | 6 | default = 'default', |
7 | dark = 'dark', | 7 | dark = 'dark', |
8 | } | 8 | } |
9 | 9 | ||
10 | export const DEFAULT_ACCENT_COLOR = legacyStyles.themeBrandPrimary; | 10 | export const DEFAULT_ACCENT_COLOR = themeBrandPrimary; |
11 | 11 | ||
12 | export function theme(themeId: ThemeType, | 12 | export function theme( |
13 | brandColor: string = DEFAULT_ACCENT_COLOR) { | 13 | themeId: ThemeType, |
14 | return themeId === ThemeType.dark ? | 14 | brandColor: string = DEFAULT_ACCENT_COLOR, |
15 | makeDarkThemeConfig(brandColor) : | 15 | ) { |
16 | makeDefaultThemeConfig(brandColor); | 16 | return themeId === ThemeType.dark |
17 | ? makeDarkThemeConfig(brandColor) | ||
18 | : makeDefaultThemeConfig(brandColor); | ||
17 | } | 19 | } |
18 | 20 | ||
19 | const defaultThemeConfigWithDefaultAccentColor = | 21 | const defaultThemeConfigWithDefaultAccentColor = |