diff options
author | 2019-09-07 15:50:23 +0200 | |
---|---|---|
committer | 2019-09-07 15:50:23 +0200 | |
commit | e7a74514c1e7c3833dfdcf5900cb87f9e6e8354e (patch) | |
tree | b8314e4155503b135dcb07e8b4a0e847e25c19cf /packages/theme | |
parent | Update CHANGELOG.md (diff) | |
parent | Update CHANGELOG.md (diff) | |
download | ferdium-app-e7a74514c1e7c3833dfdcf5900cb87f9e6e8354e.tar.gz ferdium-app-e7a74514c1e7c3833dfdcf5900cb87f9e6e8354e.tar.zst ferdium-app-e7a74514c1e7c3833dfdcf5900cb87f9e6e8354e.zip |
Merge branch 'master' of https://github.com/meetfranz/franz into franz-5.3.0
Diffstat (limited to 'packages/theme')
-rw-r--r-- | packages/theme/src/themes/dark/index.ts | 27 | ||||
-rw-r--r-- | packages/theme/src/themes/default/index.ts | 30 |
2 files changed, 57 insertions, 0 deletions
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts index bd9f001e8..e94f54c55 100644 --- a/packages/theme/src/themes/dark/index.ts +++ b/packages/theme/src/themes/dark/index.ts | |||
@@ -11,6 +11,8 @@ export const colorBackgroundSubscriptionContainer = legacyStyles.themeBrandInfo; | |||
11 | export const colorHeadline = legacyStyles.darkThemeTextColor; | 11 | export const colorHeadline = legacyStyles.darkThemeTextColor; |
12 | export const colorText = legacyStyles.darkThemeTextColor; | 12 | export const colorText = legacyStyles.darkThemeTextColor; |
13 | 13 | ||
14 | export const defaultContentBorder = legacyStyles.themeGrayDark; | ||
15 | |||
14 | // Loader | 16 | // Loader |
15 | export const colorFullscreenLoaderSpinner = '#FFF'; | 17 | export const colorFullscreenLoaderSpinner = '#FFF'; |
16 | export const colorWebviewLoaderBackground = color(legacyStyles.darkThemeGrayDarkest).alpha(0.5).rgb().string(); | 18 | export const colorWebviewLoaderBackground = color(legacyStyles.darkThemeGrayDarkest).alpha(0.5).rgb().string(); |
@@ -118,3 +120,28 @@ export const announcements = merge({}, defaultStyles.announcements, { | |||
118 | background: legacyStyles.darkThemeGrayDark, | 120 | background: legacyStyles.darkThemeGrayDark, |
119 | }, | 121 | }, |
120 | }); | 122 | }); |
123 | |||
124 | // Signup | ||
125 | export const signup = merge({}, defaultStyles.signup, { | ||
126 | pricing: { | ||
127 | feature: { | ||
128 | background: legacyStyles.darkThemeGrayLight, | ||
129 | border: color(legacyStyles.darkThemeGrayLight).lighten(0.2).hex(), | ||
130 | }, | ||
131 | }, | ||
132 | }); | ||
133 | |||
134 | // Todos | ||
135 | export const todos = merge({}, defaultStyles.todos, { | ||
136 | todosLayer: { | ||
137 | borderLeftColor: legacyStyles.darkThemeGrayDarker, | ||
138 | }, | ||
139 | toggleButton: { | ||
140 | background: defaultStyles.styleTypes.primary.accent, | ||
141 | textColor: defaultStyles.styleTypes.primary.contrast, | ||
142 | shadowColor: 'rgba(0, 0, 0, 0.2)', | ||
143 | }, | ||
144 | dragIndicator: { | ||
145 | background: legacyStyles.themeGrayLight, | ||
146 | }, | ||
147 | }); | ||
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts index 53f810f00..79a6d676f 100644 --- a/packages/theme/src/themes/default/index.ts +++ b/packages/theme/src/themes/default/index.ts | |||
@@ -28,6 +28,8 @@ export const colorHeadline = legacyStyles.themeGrayDark; | |||
28 | 28 | ||
29 | export const colorText = legacyStyles.themeTextColor; | 29 | export const colorText = legacyStyles.themeTextColor; |
30 | 30 | ||
31 | export const defaultContentBorder = color(legacyStyles.themeGrayLighter).darken(0.1).rgb().string(); | ||
32 | |||
31 | // Subscription Container Component | 33 | // Subscription Container Component |
32 | export const colorSubscriptionContainerBackground = 'none'; | 34 | export const colorSubscriptionContainerBackground = 'none'; |
33 | export const colorSubscriptionContainerBorder = `1px solid ${brandPrimary}`; | 35 | export const colorSubscriptionContainerBorder = `1px solid ${brandPrimary}`; |
@@ -207,3 +209,31 @@ export const announcements = { | |||
207 | background: legacyStyles.themeGrayLightest, | 209 | background: legacyStyles.themeGrayLightest, |
208 | }, | 210 | }, |
209 | }; | 211 | }; |
212 | |||
213 | // Signup | ||
214 | export const signup = { | ||
215 | pricing: { | ||
216 | feature: { | ||
217 | background: legacyStyles.themeGrayLightest, | ||
218 | border: legacyStyles.themeGrayLighter, | ||
219 | }, | ||
220 | }, | ||
221 | }; | ||
222 | |||
223 | // Todos | ||
224 | export const todos = { | ||
225 | todosLayer: { | ||
226 | borderLeftColor: legacyStyles.themeGrayLighter, | ||
227 | }, | ||
228 | toggleButton: { | ||
229 | background: styleTypes.primary.accent, | ||
230 | textColor: styleTypes.primary.contrast, | ||
231 | shadowColor: 'rgba(0, 0, 0, 0.2)', | ||
232 | }, | ||
233 | dragIndicator: { | ||
234 | background: legacyStyles.themeGrayLight, | ||
235 | }, | ||
236 | resizeHandler: { | ||
237 | backgroundHover: styleTypes.primary.accent, | ||
238 | }, | ||
239 | }; | ||