Commit e32291a9 authored by 2breakegg's avatar 2breakegg

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router.js
#	src/routes/Index.js
parents d1e78c3d 751da7be
import { Route, Router } from 'dva/router'; import { Redirect, Route, Router } from 'dva/router';
import React from 'react'; import React from 'react';
import Active from './routes/Activate.js'; import Active from './routes/Activate.js';
......
...@@ -125,8 +125,8 @@ const particleConfig = { ...@@ -125,8 +125,8 @@ const particleConfig = {
function Index({ children, messages }) { function Index({ children, messages }) {
return ( return (
<div style={{ display: 'flex', flexDirection: 'column', flex: 1, height: '100vh' }}> <div style={{ display: 'flex', flexDirection: 'column', flex: 1, height: '100vh' }}>
<DocumentTitle title={messages.title || 'Moe Cube'}/> <DocumentTitle title={messages['title'] || 'Moe Cube'} />
<Header style={{ display: 'flex', alignItems: 'center' }}> <Header style={{ display: 'flex', alignItems: 'center' }}>
<Link to="/" style={{ marginTop: '20px' }}> <Link to="/" style={{ marginTop: '20px' }}>
...@@ -155,16 +155,7 @@ function Index({ children, messages }) { ...@@ -155,16 +155,7 @@ function Index({ children, messages }) {
/> />
{children} {children}
<Footer <Footer style={{ flex:1, width: '100%', bottom: 0, left: 0, display: 'flex', justifyContent: 'flex-end', flexDirection: 'column' }}>
style={{
position: 'absolute',
width: '100%',
bottom: 0,
left: 0,
display: 'flex',
justifyContent: 'space-between',
}}
>
<div>© MoeCube 2017 all right reserved.</div> <div>© MoeCube 2017 all right reserved.</div>
</Footer> </Footer>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment