Merge branch 'feature/announcements' into develop

2 files changed, 13 insertions, 38 deletions

diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts
index fd04b106c..d48dbf916 100644
--- a/packages/theme/src/themes/dark/index.ts
+++ b/packages/theme/src/themes/dark/index.ts
@@ -1,5 +1,5 @@
 import color from 'color';
-import { merge, cloneDeep } from 'lodash';
+import { cloneDeep, merge } from 'lodash';
 
 import * as defaultStyles from '../default';
 import * as legacyStyles from '../legacy';
@@ -112,21 +112,9 @@ export const workspaces = merge({}, defaultStyles.workspaces, {
   },
 });
 
-// // Workspace settings
-// export const workspaceSettings = merge({}, defaultStyles.workspaceSettings, {
-//   listItemBorderColor: legacyStyles.darkThemeGrayDarker,
-//   listItemHoverBgColor: legacyStyles.darkThemeGrayDarker,
-// });
-//
-// // Workspace Drawer
-// export const workspaceDrawerBackground = color(colorBackground).lighten(0.3).hex();
-// export const workspaceDrawerAddButtonColor = legacyStyles.darkThemeGrayLighter;
-// export const workspaceDrawerAddButtonHoverColor = legacyStyles.darkThemeGraySmoke;
-// export const workspaceDrawerItemBorder = color(workspaceDrawerBackground).lighten(0.2).hex();
-// export const workspaceDrawerItemHoverBackground = color(workspaceDrawerBackground).lighten(0.2).hex();
-// export const workspaceDrawerItemActiveBackground = defaultStyles.brandPrimary;
-// export const workspaceDrawerItemNameColor = colorText;
-// export const workspaceDrawerItemNameActiveColor = 'white';
-// export const workspaceDrawerServicesColor = color(colorText).darken(0.5).hex();
-// export const workspaceDrawerServicesActiveColor = color(defaultStyles.brandPrimary).lighten(0.5).hex();
-//
+// Announcements
+export const announcements = merge({}, defaultStyles.workspaces, {
+  spotlight: {
+    background: legacyStyles.darkThemeGrayDark,
+  },
+});
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts
index d0493b82f..0f02fa3c8 100644
--- a/packages/theme/src/themes/default/index.ts
+++ b/packages/theme/src/themes/default/index.ts
@@ -201,22 +201,9 @@ export const workspaces = {
   },
 };
 
-// export const workspaceSettings = {
-//   listItemHeight: 57,
-//   listItemBorderColor: legacyStyles.themeGrayLightest,
-//   listItemHoverBgColor: legacyStyles.themeGrayLightest,
-// };
-//
-// // Workspace Drawer
-// export const workspaceDrawerWidth = 300;
-// export const workspaceDrawerPadding = 20;
-// export const workspaceDrawerBackground = color(colorBackground).lighten(0.1).hex();
-// export const workspaceDrawerAddButtonColor = legacyStyles.themeGrayLight;
-// export const workspaceDrawerAddButtonHoverColor = color(legacyStyles.themeGrayLight).lighten(0.1).hex();
-// export const workspaceDrawerItemHoverBackground = color(workspaceDrawerBackground).darken(0.01).hex();
-// export const workspaceDrawerItemActiveBackground = legacyStyles.themeGrayLightest;
-// export const workspaceDrawerItemBorder = color(workspaceDrawerBackground).darken(0.05).hex();
-// export const workspaceDrawerItemNameColor = colorText;
-// export const workspaceDrawerItemNameActiveColor = colorText;
-// export const workspaceDrawerServicesColor = color(colorText).lighten(1.5).hex();
-// export const workspaceDrawerServicesActiveColor = workspaceDrawerServicesColor;
+// Announcements
+export const announcements = {
+  spotlight: {
+    background: legacyStyles.themeGrayLightest,
+  },
+};