fix: 修复首页最大最小宽度显示问题

This commit is contained in:
yhui.yang 2017-07-27 14:08:07 +08:00
parent 0d428a34a3
commit e4a2adab11
6 changed files with 18 additions and 6 deletions

View File

@ -2,7 +2,7 @@
@import '../../styles/mixin.scss';
.footer{
// max-width: 12rem;
@include wrap-width-limit;
margin: 0px auto;
clear: both;
font-size: 12px;

View File

@ -150,8 +150,11 @@ export default class HeaderCom extends Component {
'background': 'url(./image/header-bg-img.jpg) no-repeat',
'backgroundSize':'100% 100%'
};
const headerShadeStyle = login?{}:{
'background': 'linear-gradient(to bottom,rgba(0,0,0,0.6),rgba(0,0,0,0.5))'
const headerShadeStyle = login? {
'padding':'0'
}: {
'background': 'linear-gradient(to bottom,rgba(0,0,0,0.6),rgba(0,0,0,0.5))',
'padding':'0'
};
return (
<acticle className={`header-box`} style={headerImgStyle}>

View File

@ -11,7 +11,7 @@ $color-black-light : #404040;
display: block;
font-size: 0.14rem;
z-index: 99;
// 内容宽度
@include wrap-width-limit;
.content {
@include row-width-limit;
margin: 0 auto;

View File

@ -52,6 +52,8 @@ $color-white: #fff;
}
}
.img-container{
height: 100%;
width: 100%;
padding-right: .15rem;
//background-image: url("#{$imgUrl}demo-img.png");
img{

View File

@ -12,9 +12,10 @@ $color-black-lighter: #404040;
display: -webkit-box;
-webkit-box-orient: vertical;
.main-one{
@include wrap-width-limit;
.home-des{
color: $color-blue-grey-lighter;
padding: .5rem 0 0;
padding: .4rem 0 0;
.title{
font-size: .6rem;
}
@ -26,7 +27,7 @@ $color-black-lighter: #404040;
color: $color-white;
}
.img-container{
margin-bottom: -.2rem;
margin-bottom: -.3rem;
img{
width: 100%;
height: 100%;
@ -75,6 +76,7 @@ $color-black-lighter: #404040;
.main-part{
padding: .9rem .5rem;
height: 5.8rem;
@include wrap-width-limit;
&:nth-child(odd){
background-color: $color-blue-lighter;
}
@ -83,6 +85,7 @@ $color-black-lighter: #404040;
}
}
.feat-part{
@include wrap-width-limit;
padding: .9rem .5rem;
background-color: $color-white;
p{

View File

@ -2,3 +2,7 @@
max-width: 11.7rem;
min-width: 9.7rem;
}
@mixin wrap-width-limit {
min-width: 10.7rem;
}