Skip to content

Commit

Permalink
with '#' will be ignored, and an empty message aborts the commit.
Browse files Browse the repository at this point in the history
  • Loading branch information
georgeweiler committed Nov 21, 2016
1 parent 20bdfd9 commit 8e973b3
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 13 deletions.
28 changes: 16 additions & 12 deletions packages/electrode-webpack-reporter/client/components/home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ import {Tabs, Tab} from "material-ui/Tabs";
import WarningsErrors from "./warnings-errors";
import WebpackInfo from "./webpack-info";
import Legacy from "./legacy";
import WebpackAssets from "./webpack-assets";
import WebpackModules from "./webpack-modules";


// import WebpackAssets from "./webpack-assets";
// import WebpackModules from "./webpack-modules";
import {connect} from "react-redux";
import styles from "../styles/base.css";
import Electrify from "weiler-electrify-react-component";

const Home = (props) => {
return (
Expand All @@ -19,16 +22,17 @@ const Home = (props) => {
<Tab label="Report">
<WebpackInfo {...props.info} />
<WarningsErrors errors={props.errors} warnings={props.warnings} />
<div className={styles.leftColumn}>
<WebpackModules
pureWebpackStats={props.pureWebpackStats}
modulesByPkg={props.modulesByPkg}
totalSize={props.totalSizeByPkg}
/>
</div>
<div className={styles.rightColumn}>
<WebpackAssets assets={props.assets}/>
</div>
<Electrify props={props} />
{/*<div className={styles.leftColumn}>
<WebpackModules
pureWebpackStats={props.pureWebpackStats}
modulesByPkg={props.modulesByPkg}
totalSize={props.totalSizeByPkg}
/>
</div>
<div className={styles.rightColumn}>
<WebpackAssets assets={props.assets}/>
</div>*/}
</Tab>
<Tab label="Legacy">
<div style={ {background: "black", color: "gray", padding: "10px"} }>
Expand Down
3 changes: 2 additions & 1 deletion packages/electrode-webpack-reporter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"ansi-to-html": "^0.4.1",
"chalk": "^1.1.3",
"d3": "^3.4.3",
"prettysize": "0.0.3"
"prettysize": "0.0.3",
"weiler-electrify-react-component": "^1.1.3"
}
}

0 comments on commit 8e973b3

Please sign in to comment.