Merge branch 'master' into 1509-fix-react-native-example

storybookjs · Jul 25, 2017 · 04a15a8 · 04a15a8
2 parents d4d3761 + 9b80a99
commit 04a15a8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/addons/storyshots/src/index.js b/addons/storyshots/src/index.js
@@ -24,9 +24,11 @@ const hasDependency = name =>
 export default function testStorySnapshots(options = {}) {
   addons.setChannel(createChannel());
 
-  const isStorybook = options.framework === 'react' || hasDependency('@storybook/react');
+  const isStorybook =
+    options.framework === 'react' || (!options.framework && hasDependency('@storybook/react'));
   const isRNStorybook =
-    options.framework === 'react-native' || hasDependency('@storybook/react-native');
+    options.framework === 'react-native' ||
+    (!options.framework && hasDependency('@storybook/react-native'));
 
   if (isStorybook) {
     storybook = require.requireActual('@storybook/react');

diff --git a/app/react-native/src/server/index.html.js b/app/react-native/src/server/index.html.js
@@ -36,6 +36,11 @@ export default function(publicPath, options) {
           .btn:hover{
             background-color: #eee
           }
+
+          /* Remove blue outline defined by the user argent*/
+          :focus {
+            outline: none !important;
+          }
         </style>
       </head>
       <body style="margin: 0;">

diff --git a/app/react/src/server/index.html.js b/app/react/src/server/index.html.js
@@ -67,6 +67,11 @@ export default function({ assets, publicPath, headHtml }) {
           .btn:hover{
             background-color: #eee
           }
+
+          /* Remove blue outline defined by the user argent*/
+          :focus {
+            outline: none !important;
+          }
         </style>
         ${headHtml}
       </head>

diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
     "remark-lint": "^6.0.0",
     "remark-lint-code": "^2.0.0",
     "remark-lint-code-eslint": "^2.0.0",
-    "remark-preset-lint-recommended": "^2.0.0",
+    "remark-preset-lint-recommended": "^3.0.0",
     "remark-toc": "^4.0.0",
     "shelljs": "^0.7.7",
     "symlink-dir": "^1.1.0"