Skip to content

Commit b85f6a8

Browse files
committed
Fixed the footer and 404 page.
1 parent a1d5446 commit b85f6a8

File tree

4 files changed

+101
-5
lines changed

4 files changed

+101
-5
lines changed

app/components/Footer/footer.css

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,17 @@
113113
padding: 16px;
114114
}
115115

116-
.footer-contact-wrap {
116+
/* .footer-contact-wrap {
117117
text-align: center;
118+
}*/
119+
120+
.ant-layout-footer {
121+
padding: 16px 16px !important;
118122
}
119123

120124
.footer-nav > ul {
121125
flex-direction: column;
122126
flex-wrap: wrap;
123-
text-align: center;
124127
}
125128

126129
.footer-nav > ul > li {

app/containers/NotFoundPage/index.js

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,32 @@
1111

1212
import React from 'react';
1313
import { FormattedMessage } from 'react-intl';
14+
import { Button } from 'antd';
15+
import { browserHistory } from 'react-router';
1416

1517
import messages from './messages';
1618

19+
// Css
20+
import './not-found-page.css';
21+
1722
export default class NotFound extends React.PureComponent { // eslint-disable-line react/prefer-stateless-function
1823
render() {
1924
return (
20-
<h1>
25+
<div className="exception">
26+
<div className="imgBlock">
27+
<div
28+
className="imgEle"
29+
/>
30+
</div>
31+
<div className="content">
32+
<h1>404</h1>
2133
<FormattedMessage {...messages.header} />
22-
</h1>
34+
<div className="actions">
35+
<br/>
36+
<Button size="large" onClick={() =>browserHistory.push("/#")} type="primary">Return to Home</Button>
37+
</div>
38+
</div>
39+
</div>
2340
);
2441
}
2542
}

app/containers/NotFoundPage/messages.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ import { defineMessages } from 'react-intl';
88
export default defineMessages({
99
header: {
1010
id: 'app.components.NotFoundPage.header',
11-
defaultMessage: 'This is NotFoundPage component!',
11+
defaultMessage: 'Sorry, the page you visited does not exist',
1212
},
1313
});

app/containers/NotFoundPage/not-found-page.css

Lines changed: 76 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)