Skip to content

Commit

Permalink
Merge pull request #46 from ETCDEVTeam/feature/doc-build
Browse files Browse the repository at this point in the history
problem: missing storybook build
  • Loading branch information
BelfordZ authored May 18, 2018
2 parents 64c9953 + a598e16 commit 2042f69
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 12 deletions.
17 changes: 12 additions & 5 deletions docs/iframe.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta content="IE=edge" http-equiv="X-UA-Compatible" />
<base target="_parent">
<script>
if (window.parent !== window) {
window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = window.parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
try {
window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = window.parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
} catch (error) {
// The above line can throw if we do not have access to the parent frame -- i.e. cross origin
}
}
</script>
<title>Storybook</title>

</head>

<body>
<div id="root"></div>
<div id="error-display"></div>
<script type="text/javascript" src="static/preview.7078c02e85de7461ece7.bundle.js"></script></body>
</html>
<div id="root"></div>
<div id="error-display"></div>
<script type="text/javascript" src="static/preview.f2e78b85731fd678a6b7.bundle.js"></script></body>

</html>
6 changes: 3 additions & 3 deletions docs/index.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="storybook-version" content="3.3.7">
<meta name="storybook-version" content="3.4.3">
<meta content="IE=edge" http-equiv="X-UA-Compatible" />
<title>Storybook</title>
<style>
Expand Down Expand Up @@ -40,5 +40,5 @@
</head>
<body style="margin: 0;">
<div id="root"></div>
<script type="text/javascript" src="static/manager.cd2b2377e89b693448d3.bundle.js"></script></body>
<script type="text/javascript" src="static/manager.4262c2c5b702e3b43334.bundle.js"></script></body>
</html>
1 change: 1 addition & 0 deletions docs/static/manager.4262c2c5b702e3b43334.bundle.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/static/manager.cd2b2377e89b693448d3.bundle.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/static/preview.7078c02e85de7461ece7.bundle.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/static/preview.f2e78b85731fd678a6b7.bundle.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion lib/icons3/ZoomOut.js.flow
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import SvgIcon from 'material-ui/SvgIcon';

const ZoomOut = props => (
<SvgIcon {...props} viewBox="0 0 64 64">
<circle cx="28" cy="28" r="20" fill="none" stroke="currentColor" strokeWidth="4" strokeMiterlimit="10"/><path fill="none" stroke="currentColor" d="M56 56L42.14 42.14M16 28h24" strokeWidth="4" strokeMiterlimit="10"/>
<circle cx="28" cy="28" r="20" fill="none" stroke="currentColor" strokeWidth="4" strokeMiterlimit="10" />
<path fill="none" stroke="currentColor" d="M56 56L42.14 42.14M16 28h24" strokeWidth="4" strokeMiterlimit="10" />
</SvgIcon>
);

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "emerald-js-ui",
"version": "0.0.23",
"version": "0.0.24",
"description": "",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down

0 comments on commit 2042f69

Please sign in to comment.