From b35fd83e77bd2d8c81bec3313e9aad812fe912d2 Mon Sep 17 00:00:00 2001
From: "yhui.yang" <qitmac000068@qitmac000068deMacBook-Pro.local>
Date: Fri, 28 Jul 2017 17:21:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dfirefox=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Footer/Footer.js   | 21 +++++++++++----------
 client/components/Footer/Footer.scss | 15 +++++++++------
 client/containers/Home/Home.js       | 27 +++++++++++++--------------
 client/containers/Home/Home.scss     |  2 ++
 4 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/client/components/Footer/Footer.js b/client/components/Footer/Footer.js
index b5af007c..9d776e92 100644
--- a/client/components/Footer/Footer.js
+++ b/client/components/Footer/Footer.js
@@ -14,18 +14,19 @@ class Footer extends Component {
       'background': 'url(./image/footer-bac.jpg)'
     }
     return (
-      <div className = 'footer' style = {style}>
-       
-        <div className = 'footContent'>
-          { this.props.footList.map(function(item,i){
-            return <FootItem key = { i } linkList = { item.linkList } title = { item.title } iconType = { item.iconType } ></FootItem>
-          }) }
-          <div className = 'copyRight'>
-            <h4>Copyright © 2017</h4>
-            YMFF出品 @ YMFF
+      <div className = 'footer-wrapper'>
+        <div className = 'footer' style = {style}>
+          <div className = 'footContent'>
+            { this.props.footList.map(function(item,i){
+              return <FootItem key = { i } linkList = { item.linkList } title = { item.title } iconType = { item.iconType } ></FootItem>
+            }) }
+            <div className = 'copyRight'>
+              <h4>Copyright © 2017</h4>
+              YMFF出品 @ YMFF
+            </div>
           </div>
+          <div className='footerMask'></div>
         </div>
-        <div className='footerMask'></div>
       </div>
     )
   }
diff --git a/client/components/Footer/Footer.scss b/client/components/Footer/Footer.scss
index bca0d18c..fd4b37fd 100644
--- a/client/components/Footer/Footer.scss
+++ b/client/components/Footer/Footer.scss
@@ -1,9 +1,12 @@
 @import '../../styles/common.scss';
 @import '../../styles/mixin.scss';
 
+.footer-wrapper{
+    width: 100%;
+}
 .footer{
     @include wrap-width-limit;
-    margin: 0px auto;
+    margin: 0 auto;
     clear: both;
     font-size: 12px;
     background: #000c15;
@@ -25,7 +28,7 @@
 .footerMask{
     @include wrap-width-limit;
     position: absolute;
-    top: 0px;
+    top: 0;
     height: 100%;
     width: 100%;
     background-color: #404040;
@@ -34,8 +37,8 @@
 }
 .footContent{
     @include row-width-limit;
-    width:90%;
-    margin:0px auto;
+    //width:90%;
+    margin:0 auto;
     overflow: hidden;
     position: relative;
     z-index: 2;
@@ -45,7 +48,7 @@
     width: 25%;
     float: left;
     div{
-        margin: 6px 0px;
+        margin: 6px 0;
     }
     a{
         font-weight: 200;
@@ -68,6 +71,6 @@
         margin: 0 auto 12px;
         font-weight: 500;
         position: relative;
-        text-indent: 0em;
+        text-indent: 0;
     }
 }
diff --git a/client/containers/Home/Home.js b/client/containers/Home/Home.js
index e04d78a7..f5a2f13c 100644
--- a/client/containers/Home/Home.js
+++ b/client/containers/Home/Home.js
@@ -15,7 +15,8 @@ import QueueAnim from 'rc-queue-anim';
 const oneAnim = { y: '+=30', opacity: 0, type: 'from', ease: 'easeOutQuad' };
 const imgAnim = { y: '+=50', opacity: 0, type: 'from', ease: 'easeOutQuad', duration: '1500'};
 const style = {
-  'height':'100%',
+  // 'height':'100%',
+  // 'height':'7rem',
   'width':'100%',
   'background': 'url(./image/bg-img.jpg) no-repeat',
   'backgroundSize':'100% 100%'
@@ -37,19 +38,17 @@ const HomeGuest = (props) => (
             <Col span={8} className="main-one-left">
               <Login/>
             </Col>
-            <OverPack>
-              <TweenOne
-                key="feat-motion-one"
-                animation={imgAnim}
-              >
-                <Col span={16} className="main-one-right">
-
-                  <div className="img-container">
-                    <img src="./image/demo-img.png"/>
-                  </div>
-                </Col>
-              </TweenOne>
-            </OverPack>
+            <Col span={16} className="main-one-right">
+              <OverPack>
+                <TweenOne
+                  key="feat-motion-one"
+                  animation={imgAnim}
+                  className="img-container"
+                >
+                  <img src="./image/demo-img.png"/>
+                </TweenOne>
+              </OverPack>
+            </Col>
           </Row>
         </div>
       </div>
diff --git a/client/containers/Home/Home.scss b/client/containers/Home/Home.scss
index 064eff06..4846bf19 100644
--- a/client/containers/Home/Home.scss
+++ b/client/containers/Home/Home.scss
@@ -27,6 +27,8 @@ $color-black-lighter: #404040;
       color: $color-white;
     }
     .img-container{
+      width: 100%;
+      //height: 5rem;
       margin-bottom: -.3rem;
       img{
         width: 100%;