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 ( -
- -
- { this.props.footList.map(function(item,i){ - return - }) } -
-

Copyright © 2017

- YMFF出品 @ YMFF +
+
+
+ { this.props.footList.map(function(item,i){ + return + }) } +
+

Copyright © 2017

+ YMFF出品 @ YMFF +
+
-
) } 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) => ( - - - - -
- -
- -
-
+ + + + + + +
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%;