feat: 恢复footer

This commit is contained in:
wenbo.dong 2017-09-21 14:15:42 +08:00
parent 10649924cd
commit 1fd34320ce
4 changed files with 14 additions and 19 deletions

View File

@ -5,7 +5,7 @@ import { Route, BrowserRouter as Router } from 'react-router-dom';
import { Home, Group, Project, Follows, AddProject, Login } from './containers/index';
import User from './containers/User/User.js';
import Header from './components/Header/Header';
// import Footer from './components/Footer/Footer';
import Footer from './components/Footer/Footer';
import Loading from './components/Loading/Loading';
import { checkLoginState } from './reducer/modules/user';
import { requireAuthentication } from './components/AuthenticatedComponent';
@ -61,6 +61,7 @@ export default class App extends Component {
<Route path="/login" component={Login} />
</div>
</div>
<Footer/>
</div>
</Router>

View File

@ -4,7 +4,7 @@ import ProjectList from './ProjectList/ProjectList.js';
import MemberList from './MemberList/MemberList.js';
import { Route, Switch, Redirect } from 'react-router-dom';
import { Tabs, Layout } from 'antd';
const { Content, Footer, Sider } = Layout;
const { Content, Sider } = Layout;
const TabPane = Tabs.TabPane;
import './Group.scss';
@ -29,9 +29,6 @@ export default class Group extends Component {
<TabPane tab="成员列表" key="2"><MemberList/></TabPane>
</Tabs>
</Content>
<Footer style={{ textAlign: 'center' }}>
© 2017 YMFE 京ICP备17044220号
</Footer>
</Layout>
</Layout>
)

View File

@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
import { Tabs, Layout } from 'antd';
import { Route, Switch, matchPath } from 'react-router-dom';
import { connect } from 'react-redux';
const { Content, Footer, Sider } = Layout;
const { Content, Sider } = Layout;
import './interface.scss'
@ -104,9 +104,6 @@ class Interface extends Component {
</Switch>
</div>
</Content>
<Footer style={{ textAlign: 'center' }}>
© 2017 YMFE 京ICP备17044220号
</Footer>
</Layout>
</Layout>)
}

View File

@ -69,17 +69,17 @@ em {
}
// 页面最外层元素 样式
.router-main {
// padding-bottom: .24rem;
// min-height: 100%;
// height: auto !important;
// height: 100%;
// margin-bottom: -2.4rem;
padding-bottom: .24rem;
min-height: 100%;
height: auto !important;
height: 100%;
margin-bottom: -2.4rem;
background-color: #ececec;
// &::after {
// content: '';
// display: block;
// height: 2.4rem;
// }
&::after {
content: '';
display: block;
height: 2.4rem;
}
}
.hidden {