ued / yohogirls-frontend · Commits

Go to a project

Authored by happyhour7
Commit 7f3ff88acce77ba1464cb7cab53dbd365f472bb2 2 parents ce96fa69 3820d4c5

Merge branch 'ww_develop' into develop

Inline Side-by-side
Showing 7 changed files with 229 additions and 70 deletions

1.23 KB | W: | H:

1.85 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -26,12 +26,6 @@
.menubar-header{width:100%;}
.menubar-header-default{background:#c3e2ce;}
.menubar-header-beauty{background:#c3e2ce;}
.menubar-header-sport{background:#c3e2ce;}
.menubar-header-lifestyle{background:#c3e2ce;}
.menubar-header-magazine{background:#c3e2ce;}
.menubar-header-vedio{background:#c5c5c5;}
.menubar-move{width:100%;}
.menubar{
... ... @@ -228,7 +222,7 @@
float:right;
width:221px;
height:43px;
background:#c3e2ce;
/*background:#c3e2ce;*/
position:relative;
.getapp{
... ... @@ -437,7 +431,7 @@
position:relative;
.advert{
width:342px;
height:480px;
height:495px;
float:left;
margin:27px 13px 0px 13px;
position:relative;
... ... @@ -544,10 +538,10 @@
.advert-without-border{
width:342px;
height:481px;
height:495px;
float:right;
padding-bottom:0;
margin:27px 13px 0 13px;
margin-top:27px;
img{width:100%;}
position:relative;
.buy-magazine{
... ... @@ -582,8 +576,8 @@
}
.content-item-without-border{
width:342px;
height:481px;
margin:27px 13px 0 13px;
height:495px;
margin-top:27px;
float:left;
position:relative;
.week-top{
... ... @@ -597,7 +591,7 @@
width:345px;
height:175px;
background:url(../assets/images/followusbackground.png) left top;
/*background-size:390px 525px; */
background-size:394px 522px;
.title{
@include blockwh(100%,70px);
line-height:90px;
... ... @@ -802,9 +796,9 @@
}
.content-item{
width:342px;
height:450px;
height:464px;
padding-bottom:30px;
margin:27px 13px 0 13px;
margin-top:27px;
overflow:hidden;
border-bottom:1px solid #000;
float:left;
... ... @@ -821,7 +815,7 @@
width:345px;
height:175px;
background:url(../assets/images/followusbackground.png) left top;
background-size:100%;
background-size:394px 522px;
.title{
@include blockwh(100%,70px);
line-height:90px;
... ... @@ -1218,50 +1212,50 @@
}
}
.center-advt-area {
width: 1080px;
height: 140px;
float: left;
margin: 20px 0 30px 0;
position:relative;
.link {
display:block;
.center-advt-area {
width: 1080px;
height: 140px;
float: left;
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%;
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;
}
}
}
}
.pagination {
display:inline-block;
height:30px;
text-align: center;
}
}
.bottom-item-container {
.bottom-item-container {
width: 1080px;
overflow: hidden;
position: relative;
... ... @@ -1381,7 +1375,104 @@
}
}
.advt-area-margin-default {
margin: 20px 0 30px 0;
}
.advt-area-margin-channel {
margin: 10px 0 10px 0;
}
.content-item-detail-a-img{
display:block;
width:342px;
height:218px;
margin-bottom:15px;
position:relative;
overflow:hidden;
.pic{
width:342px;
height:218px;
-webkit-transition: all .3s ease-in-out;
transition: all .3s ease-in-out;
-moz-transition: all .3s ease-in-out;
-webkit-transition: all .3s ease-in-out;
-o-transition: all .3s ease-in-out;
}
.link{
@include blockwh(100%,100%);
}
.video-icon{
position:absolute;
left:50%;
top:50%;
@include blockwh(50px,43px);
margin: -21px 0 0 -25px;
background:url(../assets/images/vedio.png);
cursor:pointer;
z-index:9;
}
}
.content-item-detail-a-img:hover .pic{-webkit-transform: scale(1.1);transform:scale(1.1);-o-transform:scale(1.1);-moz-transform:scale(1.1);}
.content-item-detail-title {
display: block;
width: 342px;
font-size: 20px;
cursor: pointer;
line-height: 30px;
text-align: center;
font-weight: bold;
color: #000;
}
.content-item-detail-subtitle {
display: block;
font-size: 20px;
cursor: pointer;
line-height: 30px;
text-align: center;
font-weight: bold;
width: 342px;
color: #000;
}
.content-item-detail-subchannle {
text-align: center;
display: inline-block;
margin: 0 auto;
height: 30px;
color: #999;
line-height: 30px;
}
.content-item-mid {
margin-left:27px;
margin-right:27px;
}
.content-item-detail-detail {
display: block;
width: 342px;
font-size: 14px;
color: #000;
line-height: 24px;
text-align: center;
overflow: hidden;
}
... ...
... ... @@ -520,7 +520,7 @@
height:381px;
padding-bottom:0px;
float:right;
margin:27px 13px 0 13px;
margin-top:27px;
img{width:100%;}
position:relative;
.buy-magazine{
... ... @@ -654,7 +654,7 @@
width:290px;
height:381px;
margin:27px 13px 0 13px;
margin-top:27px;
float:left;
overflow:hidden;
position:relative;
... ... @@ -798,7 +798,7 @@
width:290px;
height:380px;
/*padding-bottom:30px;*/
margin:27px 13px 0 13px;
margin-top:27px;
border-bottom:1px solid #000;
float:left;
overflow:hidden;
... ...
... ... @@ -115,24 +115,92 @@ sizes, pagination, etc.
/* ===============================================================
Pagination Styles
================================================================*/
.swiper-pagination-switch {
.swiper-pagination {
@include blockwh(30px,30px);
float:left;
cursor:pointer;
background:url(../assets/images/pagercycle.png) no-repeat;
}
.pagination-big-banner{
.swiper-pagination {
@include blockwh(30px,30px);
cursor:pointer;
background:url(../assets/images/pagercycle.png) left -30px no-repeat;
float:left;
}
.swiper-active-switch {
@include blockwh(20px,20px);
float:left;
background:#000;
cursor:pointer;
background:url(../assets/images/pagercycle.png) no-repeat;
}
/*默认首页*/
.swiper-pagination-switch {
background-position: left -30px;
}
.swiper-visible-switch {
background-position: left top;
}
}
.swiper-visible-switch {
/* Specific visible button style: */
.pagination-big-banner-default{
.swiper-pagination {
@include blockwh(30px,30px);
float:left;
cursor:pointer;
background:url(../assets/images/pagercycle.png) left top no-repeat;
background:url(../assets/images/pagercycle.png) no-repeat;
}
/*默认首页*/
.swiper-pagination-switch {
background-position: left -30px;
}
.swiper-visible-switch {
background-position: left top;
}
}
.pagination-big-banner-fashion{
/*默认首页*/
.swiper-pagination-switch {
background-position: -30px -30px;
}
.swiper-visible-switch {
background-position: -30px top;
}
}
.pagination-big-banner-beauty{
/*默认首页*/
.swiper-pagination-switch {
background-position: -90px -30px;
}
.swiper-visible-switch {
background-position: -90px top;
}
}
.pagination-big-banner-sports{
/*默认首页*/
.swiper-pagination-switch {
background-position: -150px -30px;
}
.swiper-visible-switch {
background-position: -150px top;
}
}
.pagination-big-banner-lifestyle{
/*默认首页*/
.swiper-pagination-switch {
background-position: -60px -30px;
}
.swiper-visible-switch {
background-position: -60px top;
}
}
.pagination-big-banner-video{
/*默认首页*/
.swiper-pagination-switch {
background-position: -180px -30px;
}
.swiper-visible-switch {
background-position: -180px top;
}
}
... ...