diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-26 15:38:20 +0100 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-26 15:38:20 +0100 |
commit | b5ad31e316c1074cfa6f57f83e262a607eda9d44 (patch) | |
tree | affcfbc28b8892388ab23d97415902edfc682cab /packages | |
parent | finish basic workspace settings (diff) | |
parent | remove unused packages (diff) | |
download | ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.tar.gz ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.tar.zst ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.zip |
fixes merge conflicts with latest develop
Diffstat (limited to 'packages')
-rw-r--r-- | packages/theme/src/themes/dark/index.ts | 2 | ||||
-rw-r--r-- | packages/theme/src/themes/default/index.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts index 1757f5abd..3a56719b2 100644 --- a/packages/theme/src/themes/dark/index.ts +++ b/packages/theme/src/themes/dark/index.ts | |||
@@ -62,4 +62,4 @@ export const selectOptionItemHoverColor = selectColor; | |||
62 | export const selectSearchColor = inputBackground; | 62 | export const selectSearchColor = inputBackground; |
63 | 63 | ||
64 | // Modal | 64 | // Modal |
65 | export const colorModalOverlayBackground = color(legacyStyles.darkThemeGray).alpha(0.8).rgb().string(); | 65 | export const colorModalOverlayBackground = color(legacyStyles.darkThemeBlack).alpha(0.8).rgb().string(); |
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts index 40521995b..8a71e61cf 100644 --- a/packages/theme/src/themes/default/index.ts +++ b/packages/theme/src/themes/default/index.ts | |||
@@ -139,4 +139,4 @@ export const badgeFontSize = uiFontSize - 2; | |||
139 | export const badgeBorderRadius = 50; | 139 | export const badgeBorderRadius = 50; |
140 | 140 | ||
141 | // Modal | 141 | // Modal |
142 | export const colorModalOverlayBackground = color(legacyStyles.themeGrayLighter).alpha(0.8).rgb().string(); | 142 | export const colorModalOverlayBackground = color('#000').alpha(0.5).rgb().string(); |