diff options
author | 2019-10-24 15:15:42 +0200 | |
---|---|---|
committer | 2019-10-24 15:15:42 +0200 | |
commit | 54f8b191a94bd78a85b046bbf21dd2245d3a6f3e (patch) | |
tree | ada5876f0e8a697ba4693bba07f5e0f31fea1fc9 /packages/theme/src | |
parent | Update submodules (diff) | |
parent | bump version to 5.4.0 (diff) | |
download | ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.tar.gz ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.tar.zst ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.zip |
Merge https://github.com/meetfranz/franz into franz-5.4.0-release
Diffstat (limited to 'packages/theme/src')
-rw-r--r-- | packages/theme/src/themes/dark/index.ts | 13 | ||||
-rw-r--r-- | packages/theme/src/themes/default/index.ts | 14 |
2 files changed, 25 insertions, 2 deletions
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts index 67d0cfb71..30cc19d99 100644 --- a/packages/theme/src/themes/dark/index.ts +++ b/packages/theme/src/themes/dark/index.ts | |||
@@ -66,7 +66,7 @@ export const selectSearchColor = inputBackground; | |||
66 | 66 | ||
67 | // Modal | 67 | // Modal |
68 | export const colorModalOverlayBackground = color(legacyStyles.darkThemeBlack).alpha(0.8).rgb().string(); | 68 | export const colorModalOverlayBackground = color(legacyStyles.darkThemeBlack).alpha(0.8).rgb().string(); |
69 | export const colorModalBackground = colorContentBackground; | 69 | export const colorModalBackground = legacyStyles.darkThemeGrayDark; |
70 | 70 | ||
71 | // Services | 71 | // Services |
72 | export const services = merge({}, defaultStyles.services, { | 72 | export const services = merge({}, defaultStyles.services, { |
@@ -146,3 +146,14 @@ export const todos = merge({}, defaultStyles.todos, { | |||
146 | background: legacyStyles.themeGrayLight, | 146 | background: legacyStyles.themeGrayLight, |
147 | }, | 147 | }, |
148 | }); | 148 | }); |
149 | |||
150 | // TrialStatusBar | ||
151 | export const trialStatusBar = merge({}, defaultStyles.trialStatusBar, { | ||
152 | bar: { | ||
153 | background: legacyStyles.darkThemeGray, | ||
154 | }, | ||
155 | progressBar: { | ||
156 | background: legacyStyles.darkThemeGrayLighter, | ||
157 | progressIndicator: legacyStyles.darkThemeGrayLightest, | ||
158 | }, | ||
159 | }); | ||
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts index 1862fef6f..edf56f21e 100644 --- a/packages/theme/src/themes/default/index.ts +++ b/packages/theme/src/themes/default/index.ts | |||
@@ -1,6 +1,7 @@ | |||
1 | import color from 'color'; | 1 | import color from 'color'; |
2 | import { cloneDeep } from 'lodash'; | 2 | import { cloneDeep } from 'lodash'; |
3 | 3 | ||
4 | import { darkgreen } from 'color-name'; | ||
4 | import * as legacyStyles from '../legacy'; | 5 | import * as legacyStyles from '../legacy'; |
5 | 6 | ||
6 | export interface IStyleTypes { | 7 | export interface IStyleTypes { |
@@ -224,7 +225,7 @@ export const signup = { | |||
224 | // Todos | 225 | // Todos |
225 | export const todos = { | 226 | export const todos = { |
226 | todosLayer: { | 227 | todosLayer: { |
227 | borderLeftColor: legacyStyles.themeGrayLighter, | 228 | borderLeftColor: color(legacyStyles.themeGrayLighter).darken(0.1).hex(), |
228 | }, | 229 | }, |
229 | toggleButton: { | 230 | toggleButton: { |
230 | background: styleTypes.primary.accent, | 231 | background: styleTypes.primary.accent, |
@@ -238,3 +239,14 @@ export const todos = { | |||
238 | backgroundHover: styleTypes.primary.accent, | 239 | backgroundHover: styleTypes.primary.accent, |
239 | }, | 240 | }, |
240 | }; | 241 | }; |
242 | |||
243 | // TrialStatusBar | ||
244 | export const trialStatusBar = { | ||
245 | bar: { | ||
246 | background: legacyStyles.themeGrayLightest, | ||
247 | }, | ||
248 | progressBar: { | ||
249 | background: color(legacyStyles.themeGrayLighter).darken(0.1).hex(), | ||
250 | progressIndicator: legacyStyles.themeGrayLight, | ||
251 | }, | ||
252 | }; | ||