Merge branch 'master' of https://github.com/prisma/graphql-playground

huv1k · huv1k · commit a86aec16acc7 · 2018-11-23T18:54:36.000+01:00
diff --git a/packages/graphql-playground-react/src/components/Playground/DocExplorer/ColumnDoc.tsx b/packages/graphql-playground-react/src/components/Playground/DocExplorer/ColumnDoc.tsx
@@ -32,5 +32,6 @@ const Column = styled<ColumnProps, 'div'>('div')`
   flex-flow: column;
   padding-bottom: 20px;
   border-right: 1px solid ${p => p.theme.colours.black10};
-  overflow: ${p => (p.overflow ? 'hidden scroll' : 'auto auto')};
+  overflow-x: ${p => (p.overflow ? 'hidden' : 'auto')}
+  overflow-y: ${p => (p.overflow ? 'scroll' : 'auto')}
 `

Original file line number	Diff line number	Diff line change
@@ -32,5 +32,6 @@ const Column = styled<ColumnProps, 'div'>('div')`
`32`	`32`	`flex-flow: column;`
`33`	`33`	`padding-bottom: 20px;`
`34`	`34`	`border-right: 1px solid ${p => p.theme.colours.black10};`
`35`		`- overflow: ${p => (p.overflow ? 'hidden scroll' : 'auto auto')};`
	`35`	`+ overflow-x: ${p => (p.overflow ? 'hidden' : 'auto')}`
	`36`	`+ overflow-y: ${p => (p.overflow ? 'scroll' : 'auto')}`
`36`	`37`	`