ued / yohogirls-frontend · Commits

Go to a project

Authored by 2586703@qq.com
Commit f8c2658c945210880824a1f9b9906e3f83ba4210 1 parent ed8369bc

4-24代码提交

Inline Side-by-side
Showing 17 changed files with 12 additions and 1607 deletions
... ... @@ -30,7 +30,7 @@ exports.init = function() {
cidNum;
//边栏数据相关变量
var adItem, //边栏广告
var adItem = '', //边栏广告
sideVideoTpl, //边栏视频模板
sideVideoData, //边栏视频数据
sideVideoHtml, //边栏视频渲染的html
... ...
<<<<<<< HEAD
@media screen and (min-width:1190px){
.mags-container{
width: 1080px;
margin: 0 auto;
}
.newest-mags{
margin: 43px 0 0 0;
}
.mags-info{
width: 640px;
h2{
margin: 26px 0 0 0;
height: 83px;
background-size: 36% 100%;
}
.mags-text{
margin: 38px auto 0;
width: 430px;
line-height: 24px;
font-size: 15px;
}
.date-price{
margin: 42px 0 0 0;
p{
font-size: 20px;
color: #333333;
text-align: center;
}
.price{
color: #666666;
font-size: 16px;
}
}
.mags-buy{
margin: 22px 0 0 0;
.buy-btn{
width: 160px;
height: 34px;
line-height: 34px;
font-size: 20px;
background: url("../assets/images/magazine/buy-btn.png") no-repeat center center;
}
}
}
.mags-slide{
width: 340px;
.slide-box{
height:426px;
li{
width: 340px;
height: 426px;
}
}
.slide-ctrl{
margin: 20px 0 0 0;
li{
margin: 0 0 0 15px;
a{
display: block;
width: 12px;
height: 12px;
background: url("../assets/images/magazine/slide-ctrl.png");
}
}
li.on{
a{
background: url("../assets/images/magazine/slide-ctrl-current.png");
}
}
}
}
.column-slide{
margin: 50px 0 0 0;
.slide-box{
height: 361px;
width: 1080px;
.slide-piclist{
width:1100px;
}
li{
width: 255px;
margin: 0 20px 0 0;
float: left;
img{
width: 100%;
height: 321px;
display: block;
}
span{
display: block;
margin: 18px 0 0 0;
line-height: 22px;
text-align: center;
font-size: 18px;
color: #000;
font-weight: bold;
}
}
}
}
.column-slide.magazine-list{
.slide-box{
width: 1100px;
li{
width:275px;
a{
width: 255px;
}
}
}
}
.mags-column{
margin: 43px 0 0 0;
h2{
line-height: 48px;
font-size: 28px;
text-align: center;
color: #000;
font-weight: bold;
}
.column-slide{
margin: 0 0 20px 0;
h4{
line-height: 45px;
font-size: 20px;
font-weight: bold;
}
.slide-box{
margin: 5px 0 0 0;
height: 424px;
line-height: 424px;
.slide-piclist{
float: left;
width: 1096px;
height: 424px;
}
li{
margin: 0 17px 0 0;
width: 120px;
height: 212px;
.img-wrap{
width: 120px;
height: 180px;
}
img{
width: 120px;
height: 180px;
}
span{
margin: 0;
line-height: 32px;
font-size: 14px;
}
}
}
}
}
.column-slide.mags-app-download{
margin: 37px 0 0 0;
.slide-box{
height: auto;
li{
height: 172px;
img{
width: auto;
margin: 0 auto;
}
span{
margin: 0;
display: block;
font-weight: normal;
font-size: 18px;
line-height: 22px;
text-align: center;
}
h6{
margin: 15px 0 0 12px;
font-size: 25px;
}
p{
margin: 0 0 0 12px;
line-height: 20px;
color: #666666;
font-size: 18px;
}
strong{
display: block;
margin: 22px 0 0 12px;
line-height: 18px;
font-size: 16px;
color: #000;
}
}
li.column-slide02{
img{
margin:11px 0 0 88px;
width: 170px;
height: 130px;
}
}
}
}
.column-slide.rule{
margin: 40px 0 0 0;
h2{
line-height: 48px;
font-size: 28px;
font-weight: bold;
text-align: center;
}
.slide-box{
margin: 15px 0 0 0;
height: 381px;
}
}
=======
@media screen and (min-width: 1190px) {
.mags-container {
width: 1080px;
... ... @@ -274,19 +53,10 @@
}
.slide-ctrl {
margin: 20px 0 0 0;
li {
.swiper-pagination-switch {
margin: 0 0 0 15px;
a {
display: block;
width: 12px;
height: 12px;
background: url("../assets/images/magazine/slide-ctrl.png");
}
}
li.on {
a {
background: url("../assets/images/magazine/slide-ctrl-current.png");
}
width: 12px;
height: 12px;
}
}
}
... ... @@ -434,5 +204,4 @@
height: 381px;
}
}
>>>>>>> develop
}
\ No newline at end of file
... ...
... ... @@ -92,100 +92,4 @@
width: 100%;
}
}
}
<<<<<<< HEAD
.about-nav{
margin: 0 0 0 40px;
li{
line-height: 22px;
font-size: 14px;
margin-bottom: 15px;
}
}
.about-body{
margin: 0 0 0 200px;
max-width: 370px;
h2{
line-height: 22px;
font-size: 14px;
}
p{
line-height: 18px;
font-size: 12px;
}
.about-section{
margin: 15px 0 0 0;
}
.about-section.contact-us{
img{
margin: 8px 0 0 -5px;
display: block;
width: 95px;
height: 95px;
}
}
}
.about-us-qr{
width: 230px;
margin: 34px 0 0 3px;
.product{
margin-bottom: 30px;
background-image: url("../assets/images/about/line.png");
background-repeat: no-repeat;
background-position: top center;
background-size: 2% 76%;
}
.product-wrap{
float: left;
img{
display: block;
width: 87px;
height: 87px;
}
img.qr-img{
width: 91px;
height: 91px;
}
span{
display: block;
text-align: center;
line-height: 30px;
font-size: 12px;
}
em{
font-size: 12px;
}
}
.product-wrap.product-wrap-right{
float: right;
}
}
.links-list{
margin: 10px 0 0 0;
width: 414px;
li{
float: left;
line-height: 34px;
width: 110px;
margin: 0 28px 0 0;
a{
font-size: 12px;
color: #333333;
}
}
}
.feedback .comment-textarea{
width: 370px;
textarea{
width: 354px;
}
.login-status{
width: 100%;
}
}
}
=======
>>>>>>> develop
}
\ No newline at end of file
... ...
<<<<<<< HEAD
@media screen and (max-width:768px){
.detail-container{
width: 668px;
margin: 14px auto 0;
}
/*detail标题*/
.detail-title{
width: 100%;
margin: 0 0 8px 0;
h1{
line-height: 20px;
font-size: 14px;
font-weight: bold;
}
h2{
line-height: 20px;
font-size: 14px;
font-weight: bold;
}
.detail-category{
font-size: 12px;
color: #666666;
line-height: 30px;
a{
color: #666666;
}
}
}
/*detail主体*/
.detail-body{
float: left;
width: 460px;
object{
width: 460px;
height: 259px;
}
embed{
width: 460px;
height: 259px;
}
video{
width: 460px;
height: 259px;
}
}
.video-wrap.current{
width: 182px;
object{
width: 182px;
height: 103px;
}
embed{
width: 182px;
height: 103px;
}
video{
width: 182px;
height: 103px;
}
}
/*slide图片*/
.detail-slide-body{
width: 100%;
height: 266px;
overflow: hidden;
}
.detail-slide-piclist{
li{
float: left;
width:460px;
height: 266px;
line-height: 266px;
}
}
.detail-slide-ctrl{
padding: 15px 0 0 0;
width: 100%;
height: 44px;
position: relative;
.detail-slide-ctrl-prev,.detail-slide-ctrl-next{
position:relative;
margin: -44px 0 0 0;
width: 20px;
height: 44px;
line-height: 44px;
background-size: 50% 50%;
}
.detail-slide-ctrl-prev{
margin-right: -20px;
}
.detail-slide-ctrl-next{
margin-left: -20px;
}
}
.detail-slide-ctrl-tabs{
li{
position: relative;
float: left;
margin: 0 0 0 4px;
img{
display: block;
width: 77px;
height: 44px;
}
}
li:first-child{
margin: 0;
}
li.current{
.border{
position: absolute;
left: 0px;
right: 0px;
top: 0px;
bottom: 0px;
border: 1px solid #000;
}
.arrow{
position: absolute;
width: 11px;
height: 6px;
top: -5px;
left: 50%;
margin: 0 0 0 -5px;
background-image: url("../assets/images/detail/slide-arrow.png");
background-size: 100% 100%;
}
}
}
/*资讯主体*/
.text-body{
line-height: 20px;
p{
margin: 16px 0;
line-height: 20px;
font-size: 12px;
}
}
/*标签*/
.tag-box{
margin: 26px 0 0 0;
padding: 0 0 11px 0;
background-size: 100%;
.taglist{
padding: 0 0 0 18px;
background: url("../assets/images/detail/tag-icon.png") no-repeat 1px 6px;
}
li{
float: left;
line-height: 24px;
height: 24px;
a{
padding: 0 10px 0 10px;
font-size: 14px;
color: #1c1c1b;
font-weight: bold;
}
}
li:last-child{
background: none;
}
li.last-child{
background: none;
}
}
/*统计栏*/
.stats-btn{
margin: 16px 0 0 0;
.statslist{
float: right;
}
li{
float: left;
width: 52px;
img{
display: block;
margin: 1px 0 0 1px;
}
strong{
float: left;
width: 20px;
height: 20px;
img{
display: block;
width: 18px;
height: 18px;
}
}
span{
float: left;
margin: -6px 0 0 -2px;
font-size: 10px;
color: #000;
}
}
li.comments{
margin: 0;
padding: 0;
border-left: 1px solid #000;
img,span{
float: right;
}
span{
margin: 10px 0 0 0;
img{
width: 17px;
height: 8px;
}
line-height:8px;
}
img{
width: 18px;
height: 17px;
}
}
li.current{
strong{
background-image: url("../assets/images/detail/stats-cur-bg.png");
background-size: 100% 100%;
}
}
}
/*评论*/
.comments-box{
margin: 5px 0 0 0;
}
.comments-list{
li{
padding:6px 0 10 0;
border-bottom: 1px solid #dbdbdb;
position: relative;
.userimg{
float: left;
margin: 5px 0 0 3px;
width: 28px;
height: 28px;
img{
width: 100%;
height:100%;
}
i{
width: 11px;
height: 11px;
left: 20px;
bottom: 4px;
background-size: 100% 100%;
}
}
.userinfo{
float: left;
margin: 0 0 0 10px;
h6{
line-height: 20px;
font-size: 13px;
font-weight: bold;
}
p{
margin: 2px 0 0 0;
line-height: 16px;
font-size: 12px;
}
}
}
}
.view-more{
margin: 18px 0 23px 0;
font-weight: bold;
text-align: center;
font-size: 14px;
line-height: 16px;
a{
color: #000;
}
}
.comment-textarea{
.anonymous-info {
margin-bottom: 6px;
input {
padding: 0 6px;
width: 217px;
height: 23px;
line-height: 23px;
&:first-child {
width: 216px;
}
}
}
textarea{
width: 447px;
height: 35px;
border: 1px solid #000;
resize:none;
margin: 0;
padding: 6px;
}
.login-status{
width: 455px;
height: 24px;
padding: 2px;
border: 1px solid #000;
border-top: none;
.userimg{
float: left;
margin: 3px 0 0 10px;
width: 20px;
height: 20px;
i{
width: 7px;
height: 7px;
left: 15px;
background-size: 100% 100%;
}
}
.userinfo{
margin: 0 0 0 18px;
font-size: 12px;
line-height: 24px;
}
.anonymous{
line-height: 20px;
}
.publish{
margin: 0px 16px 0 0;
.publish-btn{
width: 55px;
height: 22px;
line-height: 22px;
background-image: url("../assets/images/detail/publish-btn.png");
background-size: 100% 100%;
font-size: 12px;
}
}
}
}
/*上一篇下一篇*/
.news-next-prev{
margin: 30px 0 0 0;
height: 16px;
.prev{
float: left;
a{
margin: 0 0 0 12px;
padding: 0 0 0 22px;
background: url("../assets/images/detail/prev-arrow-1024.png") no-repeat left center;
}
}
.next{
float: right;
a{
margin: 0 12px 0 0;
padding: 0 22px 0 0;
background: url("../assets/images/detail/next-arrow-1024.png") no-repeat right center;
}
}
a{
display: block;
line-height: 16px;
font-size: 14px;
color: #999999;
}
}
/*related posts*/
.related-posts{
margin: 25px 0 0 0;
h2{
padding: 0 0 6px 0;
line-height: 22px;
font-size: 14px;
color: #000;
font-weight: bold;
background-image: url("../assets/images/detail/detail-line-1024.png");
background-repeat: no-repeat;
background-position: center bottom;
background-size: 100%;
}
.load-more {
width: 119px;
height: 25px;
}
}
.postslist{
margin: 14px 0 0 0;
width: 488px;
li{
float: left;
margin: 0 32px 0 0;
width: 212px;
height: 198px;
.pic{
position: relative;
img{
display: block;
width: 100%;
height: 135px;
}
.play-icon{
position: absolute;
width: 47px;
height: 43px;
background: url("../assets/images/detail/play-icon-1024.png");
background-size: 100% 100%;
left: 50%;
top: 50%;
margin: -22px 0 0 -23px;
}
.arrow-bottom {
border-width: 28px;
border-right-width: 0;
}
}
h4{
margin: 6px 0 0 0;
font-size: 12px;
color: #000;
line-height: 14px;
font-weight: bold;
}
p{
font-weight:bold;
margin: 5px 0 0 0;
line-height: 14px;
font-size: 12px;
color: #333;
}
}
}
/*分享*/
.share{
top: 256px;
left: 50%;
margin-left: -370px;
h4{
line-height: 23px;
font-size: 13px;
color: #000;
margin-bottom: 4px;
}
li{
width: 30px;
height: 30px;
margin-bottom: 10px;
img{
display: block;
width: 100%;
height: 100%;
}
}
}
/*detail侧边栏*/
.detail-side{
float: left;
margin: 0 0 0 26px;
width: 182px;
}
.detail-ad{
img{
display: block;
width: 100%;
}
}
.app-download{
margin: 17px 0 0 0;
padding: 6px 0 6px 6px;
width: 176px;
height: 62px;
background-size: 100% 100%;
.qr{
float: left;
width: 66px;
height: 62px;
img{
display: block;
width: 100%;
height: 100%;
}
}
.app-main{
float: left;
margin: 0 0 0 5px;
h6{
margin: 0;
line-height: 20px;
font-size: 13px;
color: #000;
}
p{
width: 90px;
line-height: 12px;
font-size: 10px;
color: #989898;
}
.download-btn{
margin: 2px 0 0 0;
a{
float: left;
margin: 0 0 0 10px;
width: 33px;
height: 13px;
img{
display: block;
width: 100%;
height: 100%;
}
}
a:first-child{
width: 46px;
height: 13px;
margin: 0;
}
}
}
}
.focus-us{
margin: 19px 0 0 0;
padding: 12px 15px 17px;
width: 152px;
height: 66px;
background-size: 100% 100%;
h4{
line-height: 20px;
font-size: 18px;
color: #000;
text-align: center;
}
.focuslist{
margin:7px auto 0;
li{
float: left;
width: 15px;
height: 15px;
margin: 0 0px 0 16px;
img{
display: block;
height: 100%;
margin: 0 auto;
}
}
li.focus-wx{
position: relative;
.pop{
display: none;
z-index: 999;
position: absolute;
width: 85px;
height: 76px;
left: -34px;
top: 18px;
line-height: 76px;
vertical-align: middle;
background-size: 310%;
img{
display: inline;
vertical-align: middle;
width: 65px;
height: 65px;
margin: 7px 0 0 0;
}
}
}
li:first-child{
margin: 0 0 0 4px;
}
}
.textbox{
margin: 8px 0 0 0;
input{
float: left;
padding: 0 0 0 4px;
width: 108px;
height: 14px;
border: 1px solid #000;
outline: none;
font-size: 12px;
}
a{
float: left;
display: inline-block;
width: 38px;
height: 16px;
line-height: 16px;
background: #000;
color: #fff;
font-size: 12px;
text-align: center;
}
}
}
.side-map{
.map-section{
h2{
font-size: 16px;
background-size: 100%;
}
h6{
margin: 8px 0 0 6px;
font-size: 13px;
line-height: 16px;
color: #000;
}
p{
font-size: 12px;
}
}
}
.side-video{
margin: 17px 0 0 0;
.video-area{
object{
height: 98px;
embed{
height: 98px;
}
}
video{
height: 98px;
}
img{
width: 100%;
display: block;
}
}
h3{
margin: 3px 0 0 0;
line-height: 18px;
font-size: 12px;
font-weight: bold;
color: #000;
}
p{
margin: 5px 0 0 0;
line-height: 14px;
font-size: 12px;
color: #000;
}
}
.side-related-posts{
margin: 24px 0 0 0;
h2{
line-height: 21px;
font-size: 14px;
padding-bottom: 3px;
background-size: 100%;
}
}
.side-postslist{
li{
margin: 11px 0 0 0;
max-height: 37px;
overflow: hidden;
.pic{
width: 57px;
height: 38px;
.play-icon{
width: 17px;
height: 16px;
background-size: 100% 100%;
left: 50%;
top: 50%;
margin: -8px 0 0 -9px;
}
}
.post-title{
float: left;
width: 115px;
margin: 0 0 0 10px;
h4{
font-weight: bold;
font-size: 12px;
line-height: 16px;
}
p{
margin: 5px 0 0 0;
color: #333;
font-weight: bold;
line-height: 16px;
font-size: 12px;
}
}
}
}
.detail-zoom {
width: 500px;
margin-left: -250px;
text-align: center;
img {
max-width: 500px;
}
.guide-btn {
&.prev {
left: -70px;
}
&.next {
right: -70px;
}
}
}
=======
@media screen and (max-width: 768px) {
.detail-container {
width: 668px;
... ... @@ -1427,5 +705,4 @@
}
}
}
>>>>>>> develop
}
... ...
<<<<<<< HEAD
@media screen and (max-width:768px){
.mags-container{
width: 668px;
margin: 0 auto;
}
.newest-mags{
margin: 25px 0 0 0;
}
.mags-info{
width: 395px;
h2{
margin: 17px 0 0 0;
height: 51px;
background-size: 36% 100%;
}
.mags-text{
margin: 24px auto 0;
width: 258px;
line-height: 18px;
font-size: 12px;
}
.date-price{
margin: 20px 0 0 0;
p{
font-size: 14px;
}
.price{
font-size: 12px;
}
}
.mags-buy{
margin: 20px 0 0 0;
.buy-btn{
width: 99px;
height: 21px;
line-height: 21px;
font-size: 14px;
background-size: 100% 100%;
}
}
}
.mags-slide{
width: 210px;
.slide-box{
height:264px;
li{
width: 210px;
height: 264px;
}
}
.slide-ctrl{
margin: 8px 0 0 0;
li{
margin: 0 0 0 9px;
a{
display: block;
width: 8px;
height: 8px;
background-size: 100% 100%;
}
}
li.on{
a{
background-size: 100% 100%;
}
}
}
}
.column-slide{
margin: 27px 0 0 0;
.slide-box{
height: 221px;
.slide-piclist{
width: 680px;
}
li{
width: 158px;
margin: 0 12px 0 0;
img{
width: 100%;
height: 198px;
display: block;
}
span{
margin: 7px 0 0 0;
line-height: 16px;
font-size: 12px;
}
}
}
.slide-ctrl{
a.slide-ctrl-prev{
left: -30px;
}
a.slide-ctrl-next{
right: -40px;
}
}
}
.column-slide.magazine-list{
.slide-box{
width: 680px;
li{
width:170px;
a{
width: 158px;
}
}
}
}
.mags-column{
margin: 28px 0 0 0;
h2{
line-height: 23px;
font-size: 20px;
}
.column-slide{
margin: 0 0 20px 0;
h4{
line-height: 35px;
font-size: 14px;
}
.slide-box{
margin: 0px 0 0 0;
.slide-piclist{
width: 688px;
}
li{
margin: 0 22px 0 0;
width: 150px;
}
}
.slide-box{
margin: 0;
height: 268px;
.slide-piclist{
float: left;
width: 680px;
height: 268px;
}
li{
margin: 0 8px 0 0;
width: 76px;
height: 134px;
.img-wrap{
width: 76px;
height: 114px;
}
img{
width: 76px;
height: 114px;
}
span{
margin: 0;
line-height: 20px;
font-size: 12px;
}
}
}
.slide-ctrl{
a.slide-ctrl-prev{
left: -30px;
}
a.slide-ctrl-next{
right: -30px;
}
}
}
}
.column-slide.mags-app-download{
margin: 20px 0 0 0;
.slide-box{
height: auto;
li{
img{
width: auto;
margin: 0 auto;
}
span{
font-size: 12px;
line-height: 14px;
}
h6{
margin: 8px 0 0 12px;
line-height: 20px;
font-size: 18px;
}
p{
margin: 0 0 0 12px;
line-height: 14px;
color: #666666;
font-size: 13px;
}
strong{
display: block;
margin: 12px 0 0 12px;
line-height: 18px;
font-size: 12px;
color: #000;
}
}
li.column-slide01{
img{
width: 120px;
height: 110px;
}
}
li.column-slide02{
img{
margin: 11px 0 0 38px;
width: 123px;
height: 94px;
}
}
li.column-slide03{
img{
width: 94px;
height: 90px;
}
}
}
}
.column-slide.rule{
margin: 40px 0 0 0;
h2{
line-height: 48px;
font-size: 28px;
font-weight: bold;
text-align: center;
}
.slide-box{
margin: 15px 0 0 0;
height: 237px;
}
}
.magazine-zoom {
width: 400px;
margin-left: -200px;
text-align: center;
img {
max-width: 400px;
}
.guide-btn {
&.prev {
left: -90px;
}
&.next {
right: -90px;
}
}
}
=======
@media screen and (max-width: 768px) {
.mags-container {
width: 668px;
... ... @@ -313,19 +50,10 @@
}
.slide-ctrl {
margin: 8px 0 0 0;
li {
.swiper-pagination-switch {
margin: 0 0 0 9px;
a {
display: block;
width: 8px;
height: 8px;
background-size: 100% 100%;
}
}
li.on {
a {
background-size: 100% 100%;
}
width: 8px;
height: 8px;
}
}
}
... ... @@ -512,5 +240,4 @@
}
}
}
>>>>>>> develop
}
\ No newline at end of file
... ...
... ... @@ -6,52 +6,6 @@
.newest-mags {
margin: 46px 0 0 0;
}
<<<<<<< HEAD
.mags-info{
float: left;
width: 546px;
h2{
margin: 23px 0 0 0;
height: 70px;
background: url("../assets/images/magazine/mags-title.png") no-repeat center center;
}
.mags-text{
margin: 24px auto 0;
width: 360px;
line-height: 20px;
font-size: 14px;
text-align: center;
color: #444444;
}
.date-price{
margin: 35px 0 0 0;
p{
font-size: 17px;
color: #333333;
text-align: center;
}
.price{
color: #666666;
font-size: 14px;
}
}
.mags-buy{
margin: 18px 0 0 0;
.buy-btn{
display: block;
margin: 0 auto;
width: 137px;
height: 29px;
line-height: 29px;
font-size: 17px;
color: #fff;
text-align: center;
background-image: url("../assets/images/magazine/buy-btn-1024.png");
background-position: center center;
background-repeat: no-repeat;
}
}
=======
.mags-info {
float: left;
... ... @@ -97,7 +51,6 @@
background-repeat: no-repeat;
}
}
>>>>>>> develop
}
.mags-slide {
... ... @@ -124,187 +77,25 @@
.slide-ctrl-tabs {
display: inline-block;
}
a {
.swiper-pagination-switch {
float: left;
margin: 0 0 0 14px;
width: 10px;
height: 10px;
background-image: url("../assets/images/magazine/slide-ctrl-1024.png");
background-size: 100% 100%;
text-indent: -50px;
overflow: hidden;
}
a:first-child {
.swiper-pagination-switch:first-child {
margin: 0;
}
a.activeSlide {
.swiper-pagination-switch.swiper-active-switch {
background-image: url("../assets/images/magazine/slide-ctrl-current-1024.png");
}
a:focus {
outline: none;
}
}
}
<<<<<<< HEAD
.column-slide{
margin: 41px 0 0 0;
position: relative;
.slide-box{
width: 100%;
height: auto;
overflow: hidden;
position:relative;
height: 312px;
.loading-img{
position: absolute;
top: 50%;
left: 50%;
margin: -23px 0 0 -23px;
}
.slide-piclist{
position: relative;
width:940px;
top: 0;
left: 0;
}
li{
position: relative;
width: 218px;
float: left;
margin: 0 17px 0 0;
.img-wrap{
position: relative;
.border{
position: absolute;
left: 0;
top: 0;
right: 0;
bottom: 0;
border: 1px solid #ccc;
}
.special-icon{
position: absolute;
left: 0;
top: 0;
width: 36px;
height: 15px;
background: url("../assets/images/magazine/special.png");
}
}
img{
width: 100%;
height: 274px;
display: block;
}
span{
display: block;
margin: 18px 0 0 0;
line-height: 20px;
text-align: center;
font-size: 16px;
color: #000;
font-weight: bold;
}
}
}
.slide-ctrl{
display: none;
a{
position: absolute;
width: 35px;
height: 50px;
top: 38%;
margin-top: -18px;
background-image: url("../assets/images/magazine/slide-ctrl-btn-1024.png");
z-index: 1;
}
a.slide-ctrl-prev{
background-position: 0 0;
left: -46px;
}
a.slide-ctrl-next{
background-position: -35px 0;
right: -50px;
}
}
}
.column-slide.magazine-list{
.slide-box{
width: 940px;
li{
width:235px;
margin: 0;
a{
display: block;
width: 218px;
}
}
}
}
.mags-column{
margin: 43px 0 0 0;
h2{
line-height: 25px;
font-size: 24px;
text-align: center;
color: #000;
font-weight: bold;
}
.column-slide{
margin: 4px 0 20px 0;
h4{
line-height: 47px;
font-size: 17px;
font-weight: bold;
}
.slide-box{
margin: 0;
height: 362px;
line-height: 362px;
text-align: center;
.slide-piclist{
float: left;
width: 928px;
height: 362px;
}
li{
margin: 0 14px 0 0;
width: 102px;
height: 181px;
.img-wrap{
width: 102px;
height: 153px;
}
img{
width: 102px;
height: 153px;
}
span{
margin: 0;
line-height: 28px;
font-size: 14px;
}
}
}
.slide-ctrl{
a{
top: 50%;
margin-top: -25px;
}
a.slide-ctrl-prev{
background-position: 0 0;
left: -46px;
}
a.slide-ctrl-next{
background-position: -35px 0;
right: -46px;
}
}
}
=======
.column-slide {
margin: 41px 0 0 0;
position: relative;
... ... @@ -462,7 +253,6 @@
}
}
}
>>>>>>> develop
}
.column-slide.mags-app-download {
... ... @@ -541,67 +331,6 @@
}
}
<<<<<<< HEAD
/*大图弹层样式*/
.img-zoom {
display: none;
position: fixed;
top: 50%;
left: 50%;
z-index: 1000;
&.show {
display: block;
}
.guide-btn {
position: absolute;
width: 20px;
height: 34px;
background-image: url("../assets/images/arrow-girl.png");
background-repeat: no-repeat;
top: 50%;
margin-top: -17px;
&.prev {
left: -112px;
}
&.next {
right: -112px;
background-position: -20px 0;
}
}
}
.magazine-zoom {
width: 600px;
margin-left: -300px;
text-align: center;
img {
max-width: 600px;
}
}
.overlay {
display: none;
position: fixed;
top: 0;
bottom: 0;
right: 0;
left:0;
background: #000;
opacity: 0.6;
filter: alpha(opacity=60);
z-index: 999;
&.show {
display: block;
}
=======
/*澶у浘寮瑰眰鏍峰紡*/
.img-zoom {
display: none;
position: fixed;
... ... @@ -652,5 +381,4 @@
&.show {
display: block;
}
>>>>>>> develop
}
\ No newline at end of file
... ...