forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 09:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dashboard: fix merge

Browse source
This commit is contained in:
Kurkó Mihály 2018-01-22 23:51:45 +02:00
parent bd03f0a0ca
commit 9ea500f00c
2 changed files with 1962 additions and 1859 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3816
dashboard/assets.go
View file

File diff suppressed because one or more lines are too long

5
dashboard/assets/components/Footer.jsx
View file

@ -132,9 +132,8 @@ class Footer extends Component<Props> {
} }
render() { render() {
const {classes, general} = this.props; // The classes property is injected by withStyles(). const {content} = this.props;
const geth = general.version ? this.info('Geth', general.version) : null; const {general, home} = content;
const commit = general.commit ? this.info('Commit', general.commit.substring(0, 7)) : null;
return ( return (
<Grid container className={this.props.classes.footer} direction='row' alignItems='center' style={styles.footer}> <Grid container className={this.props.classes.footer} direction='row' alignItems='center' style={styles.footer}>