Merge https://github.com/meetfranz/franz into franz-5.4.0-release

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;
 
 // Modal
 export const colorModalOverlayBackground = color(legacyStyles.darkThemeBlack).alpha(0.8).rgb().string();
-export const colorModalBackground = colorContentBackground;
+export const colorModalBackground = legacyStyles.darkThemeGrayDark;
 
 // Services
 export const services = merge({}, defaultStyles.services, {
@@ -146,3 +146,14 @@ export const todos = merge({}, defaultStyles.todos, {
     background: legacyStyles.themeGrayLight,
   },
 });
+
+// TrialStatusBar
+export const trialStatusBar = merge({}, defaultStyles.trialStatusBar, {
+  bar: {
+    background: legacyStyles.darkThemeGray,
+  },
+  progressBar: {
+    background: legacyStyles.darkThemeGrayLighter,
+    progressIndicator: legacyStyles.darkThemeGrayLightest,
+  },
+});
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 @@
 import color from 'color';
 import { cloneDeep } from 'lodash';
 
+import { darkgreen } from 'color-name';
 import * as legacyStyles from '../legacy';
 
 export interface IStyleTypes {
@@ -224,7 +225,7 @@ export const signup = {
 // Todos
 export const todos = {
   todosLayer: {
-    borderLeftColor: legacyStyles.themeGrayLighter,
+    borderLeftColor: color(legacyStyles.themeGrayLighter).darken(0.1).hex(),
   },
   toggleButton: {
     background: styleTypes.primary.accent,
@@ -238,3 +239,14 @@ export const todos = {
     backgroundHover: styleTypes.primary.accent,
   },
 };
+
+// TrialStatusBar
+export const trialStatusBar = {
+  bar: {
+    background: legacyStyles.themeGrayLightest,
+  },
+  progressBar: {
+    background: color(legacyStyles.themeGrayLighter).darken(0.1).hex(),
+    progressIndicator: legacyStyles.themeGrayLight,
+  },
+};