Commit 0567886c authored by 2breakegg's avatar 2breakegg

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/routes/Index.js
parents f6c98b2e 6802465c
...@@ -33,7 +33,7 @@ class Login extends React.Component { ...@@ -33,7 +33,7 @@ class Login extends React.Component {
const { loading } = this.props; const { loading } = this.props;
const { intl: { messages } } = this.context; const { intl: { messages } } = this.context;
return ( return (
<div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', flex: 1 }}> <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%'}}>
<Spin spinning={loading} delay={100}> <Spin spinning={loading} delay={100}>
<Form onSubmit={this.onSubmitLogin} className="login-form"> <Form onSubmit={this.onSubmitLogin} className="login-form">
......
...@@ -125,7 +125,7 @@ const particleConfig = { ...@@ -125,7 +125,7 @@ const particleConfig = {
function Index({ children, messages }) { function Index({ children, messages }) {
return ( return (
<div style={{ display: 'flex', flexDirection: 'column', flex: 1, height: '100vh' }}> <div style={{ height: '100%'}}>
<DocumentTitle title={messages.title || 'Moe Cube'} /> <DocumentTitle title={messages.title || 'Moe Cube'} />
<Header style={{ display: 'flex', alignItems: 'center' }}> <Header style={{ display: 'flex', alignItems: 'center' }}>
...@@ -155,7 +155,7 @@ function Index({ children, messages }) { ...@@ -155,7 +155,7 @@ function Index({ children, messages }) {
/> />
{children} {children}
<Footer style={{ flex:1, width: '100%', bottom: 0, left: 0, display: 'flex', justifyContent: 'flex-end', flexDirection: 'column' }}> <Footer style={{ position: 'absolute', width: '100%'}}>
<div>© MoeCube 2017 all right reserved.</div> <div>© MoeCube 2017 all right reserved.</div>
</Footer> </Footer>
</div> </div>
......
...@@ -77,8 +77,7 @@ class Register extends React.Component { ...@@ -77,8 +77,7 @@ class Register extends React.Component {
}; };
return ( return (
<div <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%'}}>
style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', flex: 1 }}>
<Spin spinning={loading} delay={100}> <Spin spinning={loading} delay={100}>
<Steps size="large" current={0}> <Steps size="large" current={0}>
......
...@@ -51,7 +51,7 @@ class Reset extends React.Component { ...@@ -51,7 +51,7 @@ class Reset extends React.Component {
const { intl: { messages } } = this.context; const { intl: { messages } } = this.context;
return ( return (
<div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', flex: 1 }}> <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
<Spin spinning={isResetSubmit} delay={100}> <Spin spinning={isResetSubmit} delay={100}>
<Form onSubmit={this.onSubmitReset} className="login-form"> <Form onSubmit={this.onSubmitReset} className="login-form">
<FormItem> <FormItem>
......
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