Merge pull request #11297 from storybookjs/tech/revert-theming-greys-…

…flip Tech/revert theming greys flip
storybookjs · Jun 25, 2020 · 8099a05 · 8099a05
2 parents b383c17 + 8d59f46
commit 8099a05
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 23 deletions.
diff --git a/lib/theming/src/convert.ts b/lib/theming/src/convert.ts
@@ -49,15 +49,15 @@ const createColors = (vars: ThemeVars): Color => ({
   ultraviolet: color.ultraviolet,
 
   // Monochrome
-  lightest: vars.base === 'dark' ? color.darkest : color.lightest,
-  lighter: vars.base === 'dark' ? color.darker : color.lighter,
-  light: vars.base === 'dark' ? color.dark : color.light,
-  mediumlight: vars.base === 'dark' ? color.mediumdark : color.mediumlight,
+  lightest: color.lightest,
+  lighter: color.lighter,
+  light: color.light,
+  mediumlight: color.mediumlight,
   medium: color.medium,
-  mediumdark: vars.base === 'dark' ? color.mediumlight : color.mediumdark,
-  dark: vars.base === 'dark' ? color.light : color.dark,
-  darker: vars.base === 'dark' ? color.lighter : color.darker,
-  darkest: vars.base === 'dark' ? color.lightest : color.darkest,
+  mediumdark: color.mediumdark,
+  dark: color.dark,
+  darker: color.darker,
+  darkest: color.darkest,
 
   // For borders
   border: color.border,

diff --git a/lib/ui/src/components/sidebar/Sidebar.tsx b/lib/ui/src/components/sidebar/Sidebar.tsx
@@ -12,21 +12,16 @@ import { filteredLength } from './Tree/utils';
 import { Ref } from './Refs';
 import { RefType, Refs } from './RefHelpers';
 
-const Container = styled.nav(
-  {
-    position: 'absolute',
-    zIndex: 1,
-    left: 0,
-    top: 0,
-    bottom: 0,
-    right: 0,
-    width: '100%',
-    height: '100%',
-  },
-  ({ theme }) => ({
-    color: theme.color.darker,
-  })
-);
+const Container = styled.nav({
+  position: 'absolute',
+  zIndex: 1,
+  left: 0,
+  top: 0,
+  bottom: 0,
+  right: 0,
+  width: '100%',
+  height: '100%',
+});
 
 const CustomScrollArea = styled(ScrollArea)({
   '&&&&& .os-scrollbar-handle:before': {