fix: 修复firefox下的样式问题

This commit is contained in:
yhui.yang 2017-07-28 17:21:16 +08:00
parent 0e3a4ace02
commit b35fd83e77
4 changed files with 35 additions and 30 deletions

View File

@ -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>
)
}

View File

@ -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;
}
}

View File

@ -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>

View File

@ -27,6 +27,8 @@ $color-black-lighter: #404040;
color: $color-white;
}
.img-container{
width: 100%;
//height: 5rem;
margin-bottom: -.3rem;
img{
width: 100%;