Merge remote-tracking branch 'origin/master'

src/pages/home/detail/index.css

@@ -1,5 +1,5 @@
 .detail-wrap {
-    height: 100%;
+
 }
 
 .detail-wrapper {

src/pages/home/detail/index.js

@@ -25,8 +25,9 @@ class Detail extends Component {
 
     render() {
         let {id} = this.state
+        let contentHeight = window.innerHeight
         return (
-            <div className='detail-wrap'>
+            <div className='detail-wrap' style={{height: contentHeight}}>
                 <div className='detail-navbar-wrap'>
                     <NavBar
                         className='detail-navbar'

src/pages/home/kind/index.css

@@ -1,5 +1,4 @@
 .kind-wrap {
-    height: 100%
 }
 
 .kind-search-wrap {

src/pages/home/kind/index.js

@@ -28,8 +28,9 @@ class Kind extends Component {
 
     render() {
         let {id} = this.state
+        let contentHeight = window.innerHeight
         return (
-            <div className='kind-wrap'>
+            <div className='kind-wrap'  style={{height: contentHeight}}>
                 <div className='kind-navbar-wrap'>
                     <NavBar
                         className='kind-navbar'