fix: 添加footer,修正高度问题

This commit is contained in:
yhui.yang 2017-07-25 18:11:53 +08:00
parent 880f2c61cf
commit c0446b2ef2
3 changed files with 5 additions and 2 deletions

View File

@ -5,6 +5,7 @@ import { Route, HashRouter } from 'react-router-dom'
import { Home, ProjectGroups, Interface, News, AddInterface } from './containers/index'
import User from './containers/User/User.js'
import Header from './components/Header/Header'
import Footer from './components/Footer/Footer'
import Loading from './components/Loading/Loading'
import { checkLoginState } from './actions/login'
import { requireAuthentication } from './components/AuthenticatedComponent';
@ -53,6 +54,7 @@ export default class App extends Component {
<Route path="/user" component={requireAuthentication(User)} />
<Route path="/News" component={requireAuthentication(News)} />
<Route path="/AddInterface" component={ requireAuthentication(AddInterface) } />
<Footer/>
</div>
</HashRouter>
)

View File

@ -9,7 +9,7 @@ $color-black-lighter: #404040;
.home-main {
min-height:calc(100% - 2.23rem);
min-height:calc(100% - 2.47rem);
display: -webkit-box;
-webkit-box-orient: vertical;
background: $color-blue-grey-lighter;

View File

@ -11,6 +11,7 @@ html, body {
margin: 0;
padding: 0;
height: 100%;
background: #f1f3f6;
}
div, article, p, table, tr, td, th, ul, ol, li, h1, h2, h3, form, dl, dt, dd {
@ -42,5 +43,5 @@ em {
.router-main {
display: -webkit-box;
-webkit-box-orient: vertical;
background: #f1f3f6;
height: 100%;
}