Merge branch 'master' into patch-1

storybookjs · Jun 10, 2017 · 6b2d596 · 6b2d596
2 parents c757c8d + f2dc38c
commit 6b2d596
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -9,7 +9,7 @@ Please review this document to help to streamline the process and save everyone'
 No software is bug free. So, if you got an issue, follow these steps:
 
 -   Search the [issue list](https://github.com/storybooks/storybook/issues?utf8=%E2%9C%93&q=) for current and old issues.
--   If non of that is helping, create an issue with with following information:
+-   If none of that is helping, create an issue with with following information:
     -   Clear title (make is shorter if possible).
     -   Describe the issue in clear language.
     -   Share error logs, screenshots and etc.

diff --git a/addons/info/src/components/Props.js b/addons/info/src/components/Props.js
@@ -63,7 +63,7 @@ Props.defaultProps = {
 Props.propTypes = {
   node: PropTypes.shape({
     props: PropTypes.object,
-    type: PropTypes.object.isRequired,
+    type: PropTypes.node.isRequired,
   }).isRequired,
   singleLine: PropTypes.bool,
   maxPropsIntoLine: PropTypes.number.isRequired,

diff --git a/lib/ui/src/modules/ui/components/down_panel/style.js b/lib/ui/src/modules/ui/components/down_panel/style.js
@@ -49,6 +49,7 @@ export default {
     opacity: 0.5,
     maxHeight: 60,
     overflow: 'hidden',
+    cursor: 'pointer',
   },
 
   activetab: {