ued / yohogirls-frontend · Commits

Go to a project

Authored by 2586703@qq.com
Commit 8eb86635f1dd4f3bf2b1f9a0b435ce218a7f772c 2 parents 755e3c17 e1ed36fc

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-frontend into develop

Inline Side-by-side
Showing 12 changed files with 135 additions and 75 deletions
... ... @@ -24,3 +24,4 @@ spm_modules
.cache
dist
coverage
.sass-cache
... ...

1.62 KB | W: | H:

1.62 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.42 KB | W: | H:

2.74 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -387,6 +387,7 @@ dl, dt, dd, ul, li{ list-style:none;}
left:0;
bottom:0;
height:30px;
text-align:center;
position:absolute;
z-index:9;
}
... ...
... ... @@ -8,16 +8,17 @@
}
.enterprise{
width:100%;
height:126px;
height:182px;
overflow:hidden;
margin:0 auto 6px;
background:#fff;
.icons{background:url(../assets/images/phone.png) center no-repeat;}
.logo{
width:190px;
height:81px;
margin: 12px auto 0 auto;
margin: 31px auto 0 auto;
background:url(../assets/images/logo.png) no-repeat;
margin-bottom:8px;
margin-bottom:27px;
a{
@include blockwh(100%,100%);
}
... ... @@ -185,11 +186,11 @@
}
}
.menu-item{
display:block;height:43px;line-height:43px;float:left;margin:0 10px;cursor:pointer;
display:block;height:43px;line-height:43px;float:left;cursor:pointer;
}
.menu-item-hk{
display:block;height:43px;line-height:43px;float:left;margin:0 10px;cursor:pointer
display:block;height:43px;line-height:43px;float:left;cursor:pointer
}
... ... @@ -203,13 +204,13 @@
.menu-item:hover{
color:#fff;
display:block;height:43px;line-height:43px;float:left;margin:0 10px;cursor:pointer;
display:block;height:43px;line-height:43px;float:left;cursor:pointer;
.submenu{display:block;}
.submenu-withleft{display:block;}
}
.menu-item-hk:hover{
color:#fff;
display:block;height:43px;line-height:43px;float:left;margin:0 10px;cursor:pointer;
display:block;height:43px;line-height:43px;float:left;cursor:pointer;
.submenu{display:block;}
.submenu-withleft{display:block;}
}
... ... @@ -279,7 +280,7 @@
}
.splitline{
width:2px;
height:28px;
height:25px;
display:block;
float:right;
margin-top:8px;
... ... @@ -288,13 +289,15 @@
.search-text{
float:right;
height:43px;
font-size:17px;
line-height:43px;
font-size:19px;
letter-spacing:4px;
font-weight:bold;
line-height:42px;
@include fontstyle;
cursor:pointer;
padding:0 10px;
color:#000;
width:73px;
width:120px;
display:none;
}
... ... @@ -346,29 +349,29 @@
}
.scrollPic-content{
width:1190px;
width:1080px;
height:537px;
margin:28px auto 0;
position:relative;
text-align:center;
background:url(../assets/images/loading.gif) center no-repeat;
background:url(../assets/images/loading.gif) center no-repeat #fff;
overflow:hidden;
/* Fix of Webkit flickering */
.swiper-container{
width:992px;
height:504px;
background:url(../assets/images/loading.gif) center no-repeat;
width:1080px;
height:507px;
background:url(../assets/images/loading.gif) center no-repeat #fff;
}
.swiper-slide{
width:992px;
height:505px;
width:1080px;
height:507px;
overflow:hidden;
a{@include blockwh(992px,505px);background:url(../assets/images/loading.gif) center no-repeat #fff;}
a{@include blockwh(1080px,508px);background:url(../assets/images/loading.gif) center no-repeat #fff;}
img{
width:990px;
width:1080px;
display:block;
margin: 0 auto;
height:505px;
height:507px;
}
}
.pagination {
... ... @@ -381,22 +384,24 @@
.arrow{
position:absolute;
top:50%;margin-top:-43px;
top:50%;
margin-top:-50px;
cursor:pointer;
z-index:666;
@include blockwh(50px,50px);
background:url(../assets/images/nextprev.png) no-repeat;
}
.arrow-left{
background-position:left top;
left:0;
left:45px;
}
.arrow-right{background-position:right top;right:0;}
.arrow-right{background-position:right top;right:45px;}
}
.tv-area{
width:1080px;
height:125px;
margin:10px auto 0;
margin:22px auto 0;
.tv{
display:block;
float:left;
... ... @@ -881,7 +886,7 @@
{
width:182px;
padding-left:5px;
height:30px;
height:26px;
border:1px solid #000;
line-height:30px;
... ... @@ -1005,7 +1010,8 @@
.menu-link-channel{
font-size:24px;
color:#000;
padding:0 15px;
letter-spacing:1px;
line-height:38px;
@include blockwh(100%,100%);
&:hover{
... ... @@ -1014,13 +1020,22 @@
}
.menu-link-magazine {
background:url(../assets/images/magazine_icon.png) top right no-repeat;
padding-right:18px;
margin-left:22px;
width:147px;
&:hover {
background:url(../assets/images/magazine_icon.png) bottom right no-repeat;
}
}
.menu-link-fashion {width:100px;}
.menu-link-sports {width:100px;margin-left:41px;}
.menu-link-lifestyle {width:100px;margin-left:31px;}
.menu-link-beauty {width:100px;margin-left:46px;}
.menu-link-vedio {width:100px;margin-left:49px;}
.home-item-public {
... ... @@ -1113,7 +1128,7 @@
@include blockwh(100%,70px);
line-height:90px;
text-align:center;
font-size:20px;
font-size:26px;
}
.icons-content{
list-style:none;
... ... @@ -1128,6 +1143,15 @@
float:left;
margin: 0 5px;
}
.li-china {
width:80px;
height:50px;
line-height:50px;
float:left;
margin: 0 5px;
}
.icons{
cursor:pointer;
@include blockwh(100%,100%);
... ... @@ -1174,7 +1198,7 @@
{
width:182px;
padding-left:5px;
height:30px;
height:26px;
border:1px solid #000;
line-height:30px;
... ... @@ -1199,14 +1223,90 @@
height: 140px;
float: left;
margin: 20px 0 30px 0;
position:relative;
.link {
display:block;
width:100%;
height:100%;
cursor:pointer;
}
.swiper-container2,.swiper-container-single{
width:1080px;
height:140px;
overflow:hidden;
.swiper-slide{
width:1080px;
height:140px;
overflow:hidden;
background:url(../assets/images/loading.gif) center no-repeat;
.img-a{
@include blockwh(100%,100%);
cursor:pointer;
img{
width:100%;
height:100%;
}
}
}
}
.pagination {
display:inline-block;
height:30px;
text-align: center;
}
}
.bottom-item-container {
width: 1080px;
overflow: hidden;
position: relative;
.pop-container {
}
.pager-content-default{
text-align:center;
width:711px;
float:left;
height:93px;
line-height:93px;
border-bottom:1px solid #000;
border-top:1px solid #000;
.channel-index-pager{
height:60px;
margin:20px auto;
list-style:none;
font-size:20px;
display:inline-block;
font-family:"MyWebFont";
a{color:#000;}
a.pager-item{
cursor:pointer;
width:50px;
height:50px;
float:left;
line-height:50px;
text-align:center;
font-family:"MyWebFont";
}
a.ellipsis{
width:50px;
height:50px;
float:left;
line-height:50px;
text-align:center;
}
.pager-item-choosen{color:#fff;background:url(../assets/images/pager_choosen.png) center top no-repeat;}
}
}
.pop-container {
width:342px;
height:646px;
position:absolute;
... ... @@ -1281,48 +1381,6 @@
}
}
}
.pager-content-default{
text-align:center;
width:711px;
float:left;
height:93px;
line-height:93px;
border-bottom:1px solid #000;
border-top:1px solid #000;
.channel-index-pager{
height:60px;
margin:20px auto;
list-style:none;
font-size:20px;
display:inline-block;
font-family:"MyWebFont";
a{color:#000;}
a.pager-item{
cursor:pointer;
width:50px;
height:50px;
float:left;
line-height:50px;
text-align:center;
font-family:"MyWebFont";
}
a.ellipsis{
width:50px;
height:50px;
float:left;
line-height:50px;
text-align:center;
}
.pager-item-choosen{color:#fff;background:url(../assets/images/pager_choosen.png) center top no-repeat;}
}
}
... ...
... ... @@ -246,7 +246,7 @@
float:right;
width:221px;
height:41px;
background:#fff;
/*background:#fff;*/
position:relative;
... ...