ued / yohogirls-frontend · Commits

Go to a project

Authored by happyhour7
Commit 41d8279426a074e003a61fad57596c7ec78d5b98 2 parents f1fb1383 f8e99d45

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

Conflicts:
	web/js/public.js
Inline Side-by-side
Showing 14 changed files with 446 additions and 422 deletions
... ... @@ -171,8 +171,9 @@ exports.init = function() {
//右侧side的数据获取
$.ajax({
type: 'GET',
url: YohoConfig.mainUrl + '/channel/detail/getright', //?id=' + ajaxParam.id + '&type=' + ajaxParam.type + '&c=' + ajaxParam.c + '&twoc=' + ajaxParam.twoc,
url: 'http://newgirls.test.yoho.cn/channel/detail/getright?id=' + ajaxParam.id + '&type=' + ajaxParam.type + '&c=' + ajaxParam.c + '&twoc=' + ajaxParam.twoc,
dataType: 'jsonp',
jsonp: 'callback',
success: function(response) {
data = response.data;
//广告
... ... @@ -204,6 +205,7 @@ exports.init = function() {
}
//边栏related-post
if (data.mosts instanceof Array) return;
sidePostTpl = $('#side-related-posts').html();
sidePostData = {
relatedPost: {
... ... @@ -302,8 +304,9 @@ exports.init = function() {
//底部数据的获取
$.ajax({
type: 'GET',
url: YohoConfig.mainUrl + '/channel/detail/getbottom', //?id=' + ajaxParam.id + '&type=' + ajaxParam.type + '&c=' + ajaxParam.c + '&twoc=' + ajaxParam.twoc,
url: 'http://newgirls.test.yoho.cn/channel/detail/getbottom?id=' + ajaxParam.id + '&type=' + ajaxParam.type + '&c=' + ajaxParam.c + '&twoc=' + ajaxParam.twoc,
dataType: 'jsonp',
jsonp: 'callback',
success: function(response) {
data = response.data;
... ... @@ -313,32 +316,34 @@ exports.init = function() {
commentnum = data.commentnum;
//底部related-post
bottomPostTpl = $('#bottom-related-posts').html();
bottomPostData = {
relatedPost: {
postList: data.related
}
}
bottomPostHtml = mustache.render(bottomPostTpl, bottomPostData);
$('.detail-body').append($(bottomPostHtml));
postList = $('.related-posts').find("li");
postList.eq(5).nextAll().hide();
//底部related-post根据行数截取字符
if (postList.length > 0) {
postList.each(function(index, obj) {
totalLineNum = 3;
titleLineNum = $(obj).find('h3').getTextLineNumber('title');
subTitleLineNum = $(obj).find('p').getTextLineNumber('subtitle');
if (titleLineNum > 2) {
$(obj).find('h3').mlellipsis(2);
titleLineNum = 2;
}
if (subTitleLineNum > totalLineNum - titleLineNum) {
$(obj).find('p').mlellipsis(totalLineNum - titleLineNum, 'detail');
if (!data.related instanceof Array) {
bottomPostTpl = $('#bottom-related-posts').html();
bottomPostData = {
relatedPost: {
postList: data.related
}
});
}
bottomPostHtml = mustache.render(bottomPostTpl, bottomPostData);
$('.detail-body').append($(bottomPostHtml));
postList = $('.related-posts').find("li");
postList.eq(5).nextAll().hide();
//底部related-post根据行数截取字符
if (postList.length > 0) {
postList.each(function(index, obj) {
totalLineNum = 3;
titleLineNum = $(obj).find('h3').getTextLineNumber('title');
subTitleLineNum = $(obj).find('p').getTextLineNumber('subtitle');
if (titleLineNum > 2) {
$(obj).find('h3').mlellipsis(2);
titleLineNum = 2;
}
if (subTitleLineNum > totalLineNum - titleLineNum) {
$(obj).find('p').mlellipsis(totalLineNum - titleLineNum, 'detail');
}
});
}
}
//上一篇下一篇
... ... @@ -364,9 +369,9 @@ exports.init = function() {
setattitude(data.attitude.wowCount, data.attitude.zzzCount, data.attitude.wtfCount);
if (data.commentnum > 0) {
$(".comment-num").text(data.commentnum);
$(".comment-num").text(data.commentnum).addClass('hasNum');
} else {
$(".comment-num").html('<img src="' + YohoConfig.resUrl + '/assets/images/mobile/comment-mobile.png">');
$(".comment-num").removeClass('hasNum');
}
}
});
... ... @@ -414,34 +419,28 @@ exports.init = function() {
* @param：三种态度的数值
*/
function setattitude(wow, zzz, wtf) {
attitudeDataWowIcon = $(".stats-btn .wow").find("img");
attitudeWowNum = $(".stats-btn .wow").find("i");
attitudeDataZzzIcon = $(".stats-btn .zzz").find("img");
attitudeZzzNum = $(".stats-btn .zzz").find("i");
attitudeDataWtfIcon = $(".stats-btn .wtf").find("img");
attitudeWtfNum = $(".stats-btn .wtf").find("i");
attitudeWowNum = $('.stats-btn .wow').find('span');
attitudeZzzNum = $('.stats-btn .zzz').find('span');
attitudeWtfNum = $('.stats-btn .wtf').find('span');
if (wow == 0) {
attitudeDataWowIcon.show();
attitudeWowNum.hide();
attitudeWowNum.removeClass('hasNum');
} else {
attitudeWowNum.text(wow).show();
attitudeDataWowIcon.hide();
attitudeWowNum.addClass('hasNum');
attitudeWowNum.text(wow);
};
if (zzz == 0) {
attitudeDataZzzIcon.show();
attitudeZzzNum.hide();
attitudeZzzNum.removeClass('hasNum');
} else {
attitudeZzzNum.text(zzz).show();
attitudeDataZzzIcon.hide();
attitudeZzzNum.addClass('hasNum');
attitudeZzzNum.text(zzz);
};
if (wtf == 0) {
attitudeDataWtfIcon.show();
attitudeWtfNum.hide();
attitudeWtfNum.removeClass('hasNum');
} else {
attitudeWtfNum.text(wtf).show();
attitudeDataWtfIcon.hide();
attitudeWtfNum.addClass('hasNum');
attitudeWtfNum.text(wtf);
};
}
... ...
... ... @@ -95,8 +95,9 @@ exports.init = function() {
});
$.ajax({
type: 'GET',
url: '/channel/magazine/ezine',
url: 'http://newgirls.test.yoho.cn/channel/magazine/ezine',
dataType: 'jsonp',
jsonp: 'callback',
success: function(response) {
var data = response.data,
len = data.length,
... ... @@ -194,7 +195,7 @@ exports.init = function() {
*/
$('.mags-column .slide-piclist').find('li').each(function() {
if ($(this).data('type') == 2) {
if ($(this).data('type') === 4) {
$('<em class="border"></em><i class="special-icon"></i>').appendTo($(this).find('.img-wrap'));
};
});
... ...
... ... @@ -60,9 +60,10 @@ require("./login");
if ($(".comments-list").size() > 0 || $(".comment-textarea").size() > 0) return;
// 创建节点
this._creatCommentDom();
this._creatTextareaDom();
this._creatThirdLogin();
// 绑定事件
this._bindEvent();
},
... ... @@ -72,7 +73,7 @@ require("./login");
//var id = {id:this.options.cid};
$.ajax({
type: 'GET',
url: YohoConfig.mainUrl + this.options.commentPageUrl,
url: 'http://newgirls.test.yoho.cn' + this.options.commentPageUrl,
/*data: id,
dataType:'json',*/
success: function(response) {
... ... @@ -119,20 +120,25 @@ require("./login");
that.$element.prepend($(commentHtml));
//5条后的评论隐藏
that.$element.find("li").eq(4).nextAll().hide(); //5条后的评论隐藏
that.$element.find('li').eq(4).nextAll().hide(); //5条后的评论隐藏
//评论总数上千显示k+，上万显示w+
if (moreString.length === 4) {
$(".view-more").find("span").text(moreFirstnum + 'k+');
$('.view-more').find('span').text(moreFirstnum + 'k+');
} else if (moreString.length === 5) {
$(".view-more").find("span").text(moreFirstnum + 'w+');
$('.view-more').find('span').text(moreFirstnum + 'w+');
}
}
});
},
_creatTextareaDom: function() {
var textareaTpl = $('#comment-textarea-tpl').html();
$(textareaTpl).appendTo(this.$element);
},
//创建第三方登录
_creatThirdLogin: function() {
var thirdLoginTpl = $("#third-login-tpl").html();
var thirdLoginTpl = $('#third-login-tpl').html();
if (this.options.thirdLogin === true) {
$(thirdLoginTpl).appendTo(this.$element);
... ... @@ -144,7 +150,7 @@ require("./login");
_bindEvent: function() {
var that = this;
//查看更多评论
this.$element.on("click.comment", ".view-more", function() {
this.$element.on('click.morecomment', '.view-more', function() {
that.$element.find("li").show(); //显示第一页后五条
that.$element.find(".comment-pager-content").show(); //显示分页按钮
that.$element.find(".view-more").remove(); //移除view more
... ... @@ -224,44 +230,44 @@ require("./login");
};
$.ajax({
type: 'GET',
url: YohoConfig.mainUrl + that.options.publishUrl,
success: function(response) {
if (response.code === '800000') {
box.alert(tips.getTips("relogin"), 5);
that.$element.login("setLogout");
return false;
};
if (response.status && response.data) {
var $commentsList = $(".comments-list");
publishHtml = mustache.render(that.options.commentItemTpl, response.data);
type: 'GET',
url: YohoConfig.mainUrl + that.options.publishUrl,
success: function(response) {
if (response.code === '800000') {
box.alert(tips.getTips("relogin"), 5);
that.$element.login("setLogout");
return false;
};
if ($commentsList.find("li").size() === 0) {
$commentsList.html(publishHtml);
} else {
$commentsList.find("li").eq(0).before(publishHtml);
}
if (response.status && response.data) {
var $commentsList = $(".comments-list");
publishHtml = mustache.render(that.options.commentItemTpl, response.data);
box.alert(tips.getTips("publishSuccess"), 5);
$(".comment-textarea textarea").val('');
commentsNum = 1;
if (!!parseInt(that.options.commentNum.eq(0).text())) {
commentsNum = parseInt(that.options.commentNum.eq(0).text()) + 1;
};
that.options.commentNum.text(commentsNum);
} else if (900000 === response.code) {
box.alert(tips.getTips("notSameContent"), 5);
if ($commentsList.find("li").size() === 0) {
$commentsList.html(publishHtml);
} else {
box.alert(tips.getTips("systemBus"), 5);
$commentsList.find("li").eq(0).before(publishHtml);
}
publishHtml = mustache.render(that.options.commentItemTpl, response.data);
that.$element.find(".comments-list").prepend(publishHtml);
box.alert(tips.getTips("publishSuccess"), 5);
$(".comment-textarea textarea").val('');
commentsNum = 1;
if (!!parseInt(that.options.commentNum.eq(0).text())) {
commentsNum = parseInt(that.options.commentNum.eq(0).text()) + 1;
};
that.options.commentNum.text(commentsNum);
} else if (900000 === response.code) {
box.alert(tips.getTips("notSameContent"), 5);
} else {
box.alert(tips.getTips("systemBus"), 5);
}
})
/*$.ajax({
publishHtml = mustache.render(that.options.commentItemTpl, response.data);
that.$element.find(".comments-list").prepend(publishHtml);
}
});
/*$.ajax({
type:'POST',
url:YohoConfig.mainUrl + that.options.publishUrl,
data: data,
... ... @@ -377,9 +383,9 @@ require("./login");
_this.parents("li").remove();
var comments = parseInt($(".comment-num").eq(0).text()) - 1;
if (comments > 0) {
that.options.commentNum.text(comments);
that.options.commentNum.text(comments).addClass('hasNum');
} else {
that.options.commentNum.html('<img src="' + YohoConfig.resUrl + 'boysweb/assets/images/mobile/comment-mobile.png">');
that.options.commentNum.text('').removeClass('hasNum');
$(".comment-num.zero").text(0);
$(".comment-num.edit-comment").text('留言');
}
... ...
... ... @@ -5,17 +5,20 @@
*/
window.tmp$ = null;
var $ = require('jquery'), Swiper = require("yoho-idangerous.swiper");
var $ = require('jquery'),
Swiper = require("yoho-idangerous.swiper");
require("lazyload");
$(".lazy").lazyload();
//菜单初始化所使用变量
var menuTmpl = $("#menuItemTmpl").html(),
dataKey = null,
mustache = require("mustache"),
menuTmplVideo = $("#menuItemTmplVideo").html();
$.fn.top = function() {
if (arguments.length > 0) {
$(this).css("top", arguments[0]);
... ... @@ -49,12 +52,12 @@ $.fn.id = function() {
//banner========================================================================================================
if ($(".swiper-container").find(".swiper-slide").length > 1) {
var mySwiper = new Swiper('.swiper-container', {
pagination : '.pagination-banner',
loop : true,
autoplay : 5000,
grabCursor : true,
paginationClickable : true,
autoStopPlay : false
pagination: '.pagination-banner',
loop: true,
autoplay: 5000,
grabCursor: true,
paginationClickable: true,
autoStopPlay: false
});
$('.arrow-left').on('click', function(e) {
e.preventDefault();
... ... @@ -70,12 +73,12 @@ if ($(".swiper-container").find(".swiper-slide").length > 1) {
//centerbanner=============================================================================
var bannerSwiper = new Swiper('.swiper-container2', {
pagination : '.pagination-adv',
loop : true,
autoplay : 2000,
autoStopPlay : false,
paginationClickable : true,
onSlideChangeEnd : function() {
pagination: '.pagination-adv',
loop: true,
autoplay: 2000,
autoStopPlay: false,
paginationClickable: true,
onSlideChangeEnd: function() {
bannerSwiper.startAutoplay();
$(".swiper-container2 .lazy").lazyload();
}
... ... @@ -122,15 +125,15 @@ $(window).scroll(function() {
if (scrollTop >= bigMenuHeight && minMenuHasShow === false) {
$(".search-input-box").trigger("blur");
$("#maxEnterprise").css({
visibility : "hidden"
visibility: "hidden"
});
$("#minEnterprise").css({
"position" : "fixed",
"margin-top" : "0",
"padding-top" : "10px",
"top" : 0,
"position": "fixed",
"margin-top": "0",
"padding-top": "10px",
"top": 0,
//left:"50%",
"z-index" : 99999
"z-index": 99999
}).show();
minMenuHasShow = true;
$(".enterprise-header-fixed").show();
... ... @@ -140,7 +143,7 @@ $(window).scroll(function() {
} else if (scrollTop < 177 && minMenuHasShow === true) {
$(".search-input-box").trigger("blur");
$("#maxEnterprise").css({
visibility : "visible"
visibility: "visible"
});
$(".enterprise-header-fixed").hide();
$("#minEnterprise").hide();
... ... @@ -152,16 +155,16 @@ $(window).scroll(function() {
if (scrollTop > 0 && isTop === true) {
$(".return-to-top").stop().animate({
"filter" : "alpha(opacity=70)",
"-moz-opacity" : "0.7",
opacity : "0.7"
"filter": "alpha(opacity=70)",
"-moz-opacity": "0.7",
opacity: "0.7"
}, 200);
isTop = false;
} else if (scrollTop == 0) {
$(".return-to-top").stop().animate({
"filter" : "alpha(opacity=0)",
"-moz-opacity" : "0",
opacity : "0"
"filter": "alpha(opacity=0)",
"-moz-opacity": "0",
opacity: "0"
}, 200);
isTop = true;
}
... ... @@ -169,19 +172,19 @@ $(window).scroll(function() {
});
$(document).bind({
mousemove : function(event) {
mousemove: function(event) {
var scrollTop = $(this).scrollTop();
var mouseY = event.pageY - scrollTop;
if (mouseY <= 200 && minMenuHasDropDown === false && minMenuHasShow === true) {
minMenuHasDropDown = true;
$("#minEnterprise").animate({
top : 37
top: 37
}, 500);
} else if (minMenuHasDropDown === true && minMenuHasShow === true && mouseY > 200) {
minMenuHasDropDown = false;
$("#minEnterprise").animate({
top : 0
top: 0
}, 500);
}
... ... @@ -191,16 +194,16 @@ $(document).bind({
//===============================================================================================================
if (document.body.scrollTop > 0 && isTop === true) {
$(".return-to-top").animate({
"filter" : "alpha(opacity=70)",
"-moz-opacity" : "0.7",
opacity : "0.7"
"filter": "alpha(opacity=70)",
"-moz-opacity": "0.7",
opacity: "0.7"
}, 200);
isTop = false;
} else if (document.body.scrollTop == 0) {
$(".return-to-top").animate({
"filter" : "alpha(opacity=0)",
"-moz-opacity" : "0",
opacity : "0"
"filter": "alpha(opacity=0)",
"-moz-opacity": "0",
opacity: "0"
}, 200);
isTop = true;
}
... ... @@ -208,12 +211,12 @@ if (document.body.scrollTop > 0 && isTop === true) {
//回到顶部按钮======================================================================================================
$(".return-to-top").click(function() {
$("html,body").animate({
scrollTop : 0
scrollTop: 0
}, 300, function() {
$(".return-to-top").animate({
"filter" : "alpha(opacity=0)",
"-moz-opacity" : "0",
opacity : "0"
"filter": "alpha(opacity=0)",
"-moz-opacity": "0",
opacity: "0"
}, 200);
});
});
... ... @@ -273,13 +276,13 @@ function getBrowType() {
var info = {};
var sUserAgent = navigator.userAgent.toLowerCase();
info.bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
// info.bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
// info.bIsMidp = sUserAgent.match(/midp/i) == "midp";
// info.bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
// info.bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";
// info.bIsAndroid = sUserAgent.match(/android/i) == "android";
// info.bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
// info.bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
// info.bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
// info.bIsMidp = sUserAgent.match(/midp/i) == "midp";
// info.bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
// info.bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";
// info.bIsAndroid = sUserAgent.match(/android/i) == "android";
// info.bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
// info.bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
return info;
}
... ... @@ -291,13 +294,13 @@ if (!isIpad && $(".share").size() > 0) {
scrollTop = $(window).scrollTop();
if (shareOffsetTop - scrollTop - navHeight <= 0) {
$(".share").css({
"position" : "fixed",
"top" : navHeight
"position": "fixed",
"top": navHeight
});
} else {
$(".share").css({
"position" : "absolute",
"top" : shareOffsetTop
"position": "absolute",
"top": shareOffsetTop
});
}
});
... ... @@ -333,11 +336,11 @@ $(document.body).click(function() {
if (clientWidth <= 768) {
target.parent().removeAttr("style");
target.css({
width : "65px"
width: "65px"
});
} else {
target.animate({
width : searchWidth
width: searchWidth
}, 500);
}
... ... @@ -348,7 +351,8 @@ $(".search-text").click(function() {
});
$(".search-text").click(function() {
var clientWidth = document.body.clientWidth, parent = null;
var clientWidth = document.body.clientWidth,
parent = null;
$(this).find(".search-text-content").hide();
parent = $(this).parent();
if (clientWidth <= 768) {
... ... @@ -361,7 +365,7 @@ $(".search-text").click(function() {
parent.width(198);
parent.find(".search-input-box").width(150).val("").show();
$(this).animate({
width : 190
width: 190
}, 500, function() {
$(this).find(".home-search-button").show();
$(this).find(".search-input-box").focus();
... ... @@ -370,7 +374,7 @@ $(".search-text").click(function() {
parent.width(218);
parent.find(".search-input-box").width(150).val("").show();
$(this).animate({
width : 190
width: 190
}, 500, function() {
$(this).find(".home-search-button").show();
$(this).find(".search-input-box").focus();
... ... @@ -395,7 +399,7 @@ window.scrollWindow = function() {
//初始化菜单============================================================================
$.ajax({
url : "http://newgirls.test.yoho.cn/default/default/getnewest",
url: "http://newgirls.test.yoho.cn/default/default/getnewest",
dataType: "jsonp",
jsonp:"callback",
success : function(tmp) {
... ... @@ -413,10 +417,10 @@ $.ajax({
mustacheHtml=mustache.render(menuTmplVideo,data);
$(".submenu-video").find(".right-content").html(mustacheHtml);
}
}
}
});
//====================================================================================
\ No newline at end of file
... ...
... ... @@ -19,9 +19,9 @@
"jquery": "~1.8.3",
"lazyload": "~1.9.6",
"yoho.swiper": "2.7.0",
"yoho-idangerous.swiper": "~0.0.3",
"yoho-idangerous.swiper": "0.0.3",
"box": "0.0.0",
"yoho-box": "~0.0.5",
"yoho-box": "0.0.5",
"yoho-tools": "~0.0.4",
"yoho-tips": "0.0.1",
"mustache": "2.0.0",
... ...
... ... @@ -4,7 +4,7 @@
@mixin blockwh($width:auto,$height:auto){
display:block;
width:$width;
height:$height;
height:$height;
}
@mixin borderradius($radius)
{
... ... @@ -31,7 +31,7 @@ $hack_safair_end:';]';
height:36px;
line-height:36px;
padding:0;
@include fontstyle;
@include fontstyle;
li a:link {color:#777777;}
li a:hover{color:#777777;}
... ...
@media screen and (min-width:1190px){
.about-container{
width: 1080px;
margin: 30px auto 0;
}
.about-nav{
margin: 0 0 0 54px;
li{
line-height: 28px;
font-size: 21px;
margin-bottom: 18px;
}
}
.about-body{
margin: 0 0 0 346px;
max-width: 590px;
h2{
line-height: 22px;
font-size: 18px;
}
p{
line-height: 24px;
font-size: 14px;
}
.about-section{
margin: 20px 0 0 0;
}
.about-section.contact-us{
img{
margin: 16px 0 0 -5px;
display: block;
width: 95px;
height: 95px;
}
}
}
.about-us-qr{
width: 260px;
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% 80%;
}
.product-wrap{
float: left;
img{
display: block;
width: 100px;
height: 100px;
}
img.qr-img{
width: 105px;
height: 105px;
}
span{
display: block;
text-align: center;
line-height: 30px;
font-size: 14px;
}
em{
font-size: 14px;
}
}
.product-wrap.product-wrap-right{
float: right;
}
}
.feedback .comment-textarea{
width: 558px;
textarea{
width: 542px;
}
.login-status{
width: 558px;
}
}
@media screen and (min-width: 1190px) {
.about-container {
width: 1080px;
margin: 30px auto 0;
}
.about-nav {
margin: 0 0 0 54px;
li {
line-height: 28px;
font-size: 21px;
margin-bottom: 18px;
}
}
.about-body {
margin: 0 0 0 346px;
max-width: 590px;
h2 {
line-height: 22px;
font-size: 18px;
}
p {
line-height: 24px;
font-size: 14px;
}
.about-section {
margin: 20px 0 0 0;
}
.about-section.contact-us {
img {
margin: 16px 0 0 -5px;
display: block;
width: 95px;
height: 95px;
}
}
}
.about-us-qr {
width: 260px;
margin: 34px 0 0 3px;
.product {
margin-bottom: 30px;
background-image: image-url("about/line.png");
background-repeat: no-repeat;
background-position: top center;
background-size: 2% 80%;
}
.product-wrap {
float: left;
img {
display: block;
width: 100px;
height: 100px;
}
img.qr-img {
width: 105px;
height: 105px;
}
span {
display: block;
text-align: center;
line-height: 30px;
font-size: 14px;
}
em {
font-size: 14px;
}
}
.product-wrap.product-wrap-right {
float: right;
}
}
.feedback .comment-textarea {
width: 558px;
textarea {
width: 542px;
}
.login-status {
width: 558px;
}
}
}
\ No newline at end of file
... ...
... ... @@ -129,7 +129,7 @@
top: -9px;
left: 50%;
margin: 0 0 0 -9px;
background: url("../assets/images/detail/slide-arrow.png");
background: image-url("detail/slide-arrow.png");
}
}
}
... ... @@ -147,10 +147,10 @@
.tag-box{
margin: 22px 0 0 0;
padding: 0 0 15px 0;
background: url("../assets/images/detail/detail-line.png") no-repeat center bottom;
background: image-url("detail/detail-line.png") no-repeat center bottom;
.taglist{
padding: 0 0 0 24px;
background: url("../assets/images/detail/tag-icon.png") no-repeat 1px 8px;
background: image-url("detail/tag-icon.png") no-repeat 1px 8px;
}
li{
float: left;
... ... @@ -202,7 +202,7 @@
}
li.current{
strong{
background: url("../assets/images/detail/stats-cur-bg.png");
background: image-url("detail/stats-cur-bg.png");
}
}
}
... ... @@ -291,7 +291,7 @@
a{
margin: 0 0 0 19px;
padding: 0 0 0 35px;
background: url("../assets/images/detail/prev-arrow.png") no-repeat left center;
background: image-url("detail/prev-arrow.png") no-repeat left center;
}
}
... ... @@ -300,7 +300,7 @@
a{
margin: 0 19px 0 0;
padding: 0 35px 0 0;
background: url("../assets/images/detail/next-arrow.png") no-repeat right center;
background: image-url("detail/next-arrow.png") no-repeat right center;
}
}
... ... @@ -321,7 +321,7 @@
font-size: 20px;
color: #000;
font-weight: bold;
background: url("../assets/images/detail/detail-line.png") no-repeat center bottom;
background: image-url("detail/detail-line.png") no-repeat center bottom;
}
.load-more {
... ... @@ -403,7 +403,7 @@ $shareicons: sprite-map('share/*.png', $spacing:5px);
padding: 8px 0 11px 7px;
width: 282px;
height: 100px;
background: url("../assets/images/detail/app-download-bg.png");
background: image-url("detail/app-download-bg.png");
.qr{
float: left;
img{
... ... @@ -529,7 +529,7 @@ $shareicons: sprite-map('share/*.png', $spacing:5px);
line-height: 25px;
font-size: 20px;
padding-bottom: 7px;
background: url("../assets/images/detail/side-line.png") no-repeat left bottom;
background: image-url("detail/side-line.png") no-repeat left bottom;
}
.postslist{
... ... @@ -549,7 +549,7 @@ $shareicons: sprite-map('share/*.png', $spacing:5px);
position: absolute;
width: 20px;
height: 19px;
background: url("../assets/images/detail/play-icon-s.png");
background: image-url("detail/play-icon-s.png");
left: 50%;
top: 50%;
margin: -10px 0 0 -10px;
... ...
... ... @@ -38,7 +38,7 @@
height: 34px;
line-height: 34px;
font-size: 20px;
background: url("../assets/images/magazine/buy-btn.png") no-repeat center center;
background: image-url("magazine/buy-btn.png") no-repeat center center;
}
}
}
... ...
... ... @@ -39,7 +39,7 @@
margin: 34px 0 0 3px;
.product {
margin-bottom: 30px;
background-image: url("../assets/images/about/line.png");
background-image: image-url("about/line.png");
background-repeat: no-repeat;
background-position: top center;
background-size: 2% 76%;
... ...
... ... @@ -125,7 +125,7 @@
top: -5px;
left: 50%;
margin: 0 0 0 -5px;
background-image: url("../assets/images/detail/slide-arrow.png");
background-image: image-url("detail/slide-arrow.png");
background-size: 100% 100%;
}
}
... ... @@ -148,7 +148,7 @@
background-size: 100%;
.taglist {
padding: 0 0 0 18px;
background: url("../assets/images/detail/tag-icon.png") no-repeat 1px 6px;
background: image-url("detail/tag-icon.png") no-repeat 1px 6px;
}
li {
float: left;
... ... @@ -217,7 +217,7 @@
}
li.current {
strong {
background-image: url("../assets/images/detail/stats-cur-bg.png");
background-image: image-url("detail/stats-cur-bg.png");
background-size: 100% 100%;
}
}
... ... @@ -328,7 +328,7 @@
width: 55px;
height: 22px;
line-height: 22px;
background-image: url("../assets/images/detail/publish-btn.png");
background-image: image-url("detail/publish-btn.png");
background-size: 100% 100%;
font-size: 12px;
}
... ... @@ -345,7 +345,7 @@
a {
margin: 0 0 0 12px;
padding: 0 0 0 22px;
background: url("../assets/images/detail/prev-arrow-1024.png") no-repeat left center;
background: image-url("detail/prev-arrow-1024.png") no-repeat left center;
}
}
.next {
... ... @@ -353,7 +353,7 @@
a {
margin: 0 12px 0 0;
padding: 0 22px 0 0;
background: url("../assets/images/detail/next-arrow-1024.png") no-repeat right center;
background: image-url("detail/next-arrow-1024.png") no-repeat right center;
}
}
a {
... ... @@ -373,7 +373,7 @@
font-size: 14px;
color: #000;
font-weight: bold;
background-image: url("../assets/images/detail/detail-line-1024.png");
background-image: image-url("detail/detail-line-1024.png");
background-repeat: no-repeat;
background-position: center bottom;
background-size: 100%;
... ... @@ -402,7 +402,7 @@
position: absolute;
width: 47px;
height: 43px;
background: url("../assets/images/detail/play-icon-1024.png");
background: image-url("detail/play-icon-1024.png");
background-size: 100% 100%;
left: 50%;
top: 50%;
... ...
.about-container{
width: 924px;
margin: 32px auto 0;
.about-container {
width: 924px;
margin: 32px auto 0;
}
.about-nav{
float: left;
margin: 0 0 0 50px;
li{
line-height: 28px;
font-size: 18px;
margin-bottom: 18px;
a{
color: #000;
}
}
li.current{
a{
color: #999999;
}
}
.about-nav {
float: left;
margin: 0 0 0 50px;
li {
line-height: 28px;
font-size: 18px;
margin-bottom: 18px;
a {
color: #000;
}
}
li.current {
a {
color: #999999;
}
}
}
.about-body{
float: left;
max-width: 500px;
margin: 0 0 0 296px;
h2{
line-height: 22px;
font-size: 18px;
}
p{
line-height: 24px;
font-size: 14px;
}
.about-section{
margin: 20px 0 0 0;
}
.about-section:first-child{
margin:0 0 0 0;
}
.about-section.contact-us{
img{
margin: 16px 0 0 -5px;
display: block;
width: 95px;
height: 95px;
}
}
.about-body {
float: left;
max-width: 500px;
margin: 0 0 0 296px;
h2 {
line-height: 22px;
font-size: 18px;
}
p {
line-height: 24px;
font-size: 14px;
}
.about-section {
margin: 20px 0 0 0;
}
.about-section:first-child {
margin: 0 0 0 0;
}
.about-section.contact-us {
img {
margin: 16px 0 0 -5px;
display: block;
width: 95px;
height: 95px;
}
}
}
.about-body.feedback-body{
float: right;
.about-body.feedback-body {
float: right;
}
.comments-box.feedback{
margin:0;
.comments-box.feedback {
margin: 0;
}
.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;
}
.product-wrap{
float: left;
img{
display: block;
width: 91px;
height: 91px;
}
img.qr-img{
width: 95px;
height: 95px;
}
span{
display: block;
text-align: center;
line-height: 29px;
font-size: 13px;
}
em{
font-size: 13px;
}
}
.product-wrap.product-wrap-right{
float: right;
}
.about-us-qr {
width: 230px;
margin: 34px 0 0 3px;
.product {
margin-bottom: 30px;
background-image: image-url("about/line.png");
background-repeat: no-repeat;
background-position: top center;
}
.product-wrap {
float: left;
img {
display: block;
width: 91px;
height: 91px;
}
img.qr-img {
width: 95px;
height: 95px;
}
span {
display: block;
text-align: center;
line-height: 29px;
font-size: 13px;
}
em {
font-size: 13px;
}
}
.product-wrap.product-wrap-right {
float: right;
}
}
.links-list{
margin: 10px 0 0 0;
width: 552px;
li{
float: left;
line-height: 38px;
width: 110px;
margin: 0 28px 0 0;
a{
font-size: 14px;
color: #333333;
}
}
.links-list {
margin: 10px 0 0 0;
width: 552px;
li {
float: left;
line-height: 38px;
width: 110px;
margin: 0 28px 0 0;
a {
font-size: 14px;
color: #333333;
}
}
}
.links-pic-list{
li{
float: left;
width: 102px;
height: 31px;
margin:28px 16px 0 0;
img{
display: block;
margin: 0 auto;
}
}
.links-pic-list {
li {
float: left;
width: 102px;
height: 31px;
margin: 28px 16px 0 0;
img {
display: block;
margin: 0 auto;
}
}
}
.feedback .comment-textarea{
width: 500px;
textarea{
width: 484px;
}
.login-status{
width: 500px\0;
}
.feedback .comment-textarea {
width: 500px;
textarea {
width: 484px;
}
.login-status {
width: 500px\0;
}
}
\ No newline at end of file
... ...
... ... @@ -75,12 +75,12 @@
height: 138px;
}
.video-close-btn{
position: absolute;
position: absolute;
width: 12px;
height: 12px;
top: 0;
right: 10px;
background-image: url("../assets/images/detail/videoCloseBtn.png");
background-image: image-url("detail/videoCloseBtn.png");
}
}
... ... @@ -136,12 +136,12 @@
.detail-slide-ctrl-prev{
float: left;
margin-right: -30px;
background-image: url("../assets/images/detail/slide-arrow-left.png");
background-image: image-url("detail/slide-arrow-left.png");
}
.detail-slide-ctrl-next{
float: right;
margin-left: -30px;
background-image: url("../assets/images/detail/slide-arrow-right.png");
background-image: image-url("detail/slide-arrow-right.png");
}
}
.detail-slide-ctrl-tabs{
... ... @@ -177,7 +177,7 @@
top: -9px;
left: 50%;
margin: 0 0 0 -9px;
background-image: url("../assets/images/detail/slide-arrow.png");
background-image: image-url("detail/slide-arrow.png");
}
}
}
... ... @@ -214,10 +214,10 @@
.tag-box{
margin: 30px 0 0 0;
padding: 0 0 15px 0;
background: url("../assets/images/detail/detail-line-1024.png") no-repeat center bottom;
background: image-url("detail/detail-line-1024.png") no-repeat center bottom;
.taglist{
padding: 0 0 0 24px;
background: url("../assets/images/detail/tag-icon.png") no-repeat 1px 8px;
background: image-url("detail/tag-icon.png") no-repeat 1px 8px;
}
li{
float: left;
... ... @@ -263,46 +263,57 @@ $statusicon: sprite-map('status/*.png', $spacing:5px);
width: 20px;
height: 24px;
font-weight: bold;
text-align: center;
}
}
li.wow {
strong {
background: url("../assets/images/detail/wow-icon.png") no-repeat center center;
background: image-url("detail/wow-icon.png") no-repeat center center;
background-size: 100% 100%;
}
span {
background: sprite($statusicon, wow-icon);
&.hasNum {
background: none;
}
}
}
li.wow.current strong{
background: url("../assets/images/detail/wow-icon-curr.png") no-repeat center center;
background: image-url("detail/wow-icon-curr.png") no-repeat center center;
background-size: 100% 100%;
}
li.zzz {
strong {
background: url("../assets/images/detail/zzz-icon.png") no-repeat center center;
background: image-url("detail/zzz-icon.png") no-repeat center center;
background-size: 100% 100%;
}
span {
background: sprite($statusicon, zzz-icon);
&.hasNum {
background: none;
}
}
}
li.zzz.current strong{
background: url("../assets/images/detail/zzz-icon-curr.png") no-repeat center center;
background: image-url("detail/zzz-icon-curr.png") no-repeat center center;
background-size: 100% 100%;
}
li.wtf {
strong {
background: url("../assets/images/detail/wtf-icon.png") no-repeat center center;
background: image-url("detail/wtf-icon.png") no-repeat center center;
background-size: 100% 100%;
}
span {
background: sprite($statusicon, wtf-icon);
&.hasNum {
background: none;
}
}
}
li.wtf.current strong{
background: url("../assets/images/detail/wtf-icon-curr.png") no-repeat center center;
background: image-url("detail/wtf-icon-curr.png") no-repeat center center;
background-size: 100% 100%;
}
li.comments{
... ... @@ -318,6 +329,10 @@ $statusicon: sprite-map('status/*.png', $spacing:5px);
right: 10px;
background: image-url("detail/comments-icon2.png") no-repeat center center;
}
.hasNum {
background: none;
line-height: 24px;
}
}
}
... ... @@ -358,16 +373,16 @@ $statusicon: sprite-map('status/*.png', $spacing:5px);
background-repeat: no-repeat;
}
i.qq{
background-image:url("../assets/images/detail/comment-qq-icon.png");
background-image:image-url("detail/comment-qq-icon.png");
}
i.weibo{
background-image:url("../assets/images/detail/comment-sina-icon.png");
background-image:image-url("detail/comment-sina-icon.png");
}
i.facebook{
background-image:url("../assets/images/detail/comment-fb-icon.png");
background-image:image-url("detail/comment-fb-icon.png");
}
i.yoho{
background-image:url("../assets/images/detail/comment-yoho-icon.png");
background-image:image-url("detail/comment-yoho-icon.png");
}
}
.userinfo{
... ... @@ -389,7 +404,7 @@ $statusicon: sprite-map('status/*.png', $spacing:5px);
position: absolute;
width: 15px;
height: 15px;
background: url("../assets/images/detail/delete-comment.png");
background: image-url("detail/delete-comment.png");
right:0px;
top: 50%;
margin: -8px 0 0 0;
... ... @@ -487,16 +502,16 @@ $statusicon: sprite-map('status/*.png', $spacing:5px);
background-repeat: no-repeat;
}
i.qq{
background-image:url("../assets/images/detail/comment-qq-icon-loginarea.png");
background-image:image-url("detail/comment-qq-icon-loginarea.png");
}
i.sina{
background-image:url("../assets/images/detail/comment-sina-icon-loginarea.png");
background-image:image-url("detail/comment-sina-icon-loginarea.png");
}
i.fb{
background-image:url("../assets/images/detail/comment-fb-icon-loginarea.png");
background-image:image-url("detail/comment-fb-icon-loginarea.png");
}
i.yoho{
background-image:url("../assets/images/detail/comment-yoho-icon-loginarea.png");
background-image:image-url("detail/comment-yoho-icon-loginarea.png");
}
}
.userinfo{
... ... @@ -533,7 +548,7 @@ $statusicon: sprite-map('status/*.png', $spacing:5px);
height: 28px;
line-height: 28px;
text-align: center;
background: url("../assets/images/detail/publish-btn.png");
background: image-url("detail/publish-btn.png");
background-size: 100% 100%;
color: #fff;
font-size: 14px;
... ... @@ -568,7 +583,7 @@ $statusicon: sprite-map('status/*.png', $spacing:5px);
a{
margin: 0 0 0 19px;
padding: 0 0 0 35px;
background: url("../assets/images/detail/prev-arrow-1024.png") no-repeat left center;
background: image-url("detail/prev-arrow-1024.png") no-repeat left center;
}
}
... ... @@ -578,7 +593,7 @@ $statusicon: sprite-map('status/*.png', $spacing:5px);
a{
margin: 0 19px 0 0;
padding: 0 35px 0 0;
background: url("../assets/images/detail/next-arrow-1024.png") no-repeat right center;
background: image-url("detail/next-arrow-1024.png") no-repeat right center;
}
}
... ... @@ -599,7 +614,7 @@ $statusicon: sprite-map('status/*.png', $spacing:5px);
font-size: 17px;
color: #000;
font-weight: bold;
background: url("../assets/images/detail/detail-line-1024.png") no-repeat center bottom;
background: image-url("detail/detail-line-1024.png") no-repeat center bottom;
}
.load-more {
... ... @@ -607,7 +622,7 @@ $statusicon: sprite-map('status/*.png', $spacing:5px);
margin: 0 auto;
width: 162px;
height: 35px;
background: url("../assets/images/detail/loadmore.png") no-repeat center center;
background: image-url("detail/loadmore.png") no-repeat center center;
background-size: 100% 100%;
}
}
... ... @@ -630,7 +645,7 @@ $statusicon: sprite-map('status/*.png', $spacing:5px);
position: absolute;
width: 56px;
height: 52px;
background: url("../assets/images/detail/play-icon-1024.png");
background: image-url("detail/play-icon-1024.png");
background-size: 100% 100%;
left: 50%;
top: 50%;
... ... @@ -698,7 +713,7 @@ $shareicons: sprite-map('share/*.png', $spacing:5px);
padding: 22px 0 0 0;
left: 38px;
top: -100px;
background:url("../assets/images/detail/qr-wrap.png");
background:image-url("detail/qr-wrap.png");
font-size:12px;
z-index: 9999;
}
... ... @@ -746,7 +761,7 @@ $shareicons: sprite-map('share/*.png', $spacing:5px);
padding: 4px 0 6px 7px;
width: 239px;
height: 90px;
background-image: url("../assets/images/detail/app-download-bg-1024.png");
background-image: image-url("detail/app-download-bg-1024.png");
.qr{
float: left;
img{
... ... @@ -882,7 +897,7 @@ $icons: sprite-map('detail-icon/*.png', $spacing:5px);
font-size: 20px;
color: #1c1c1b;
padding-bottom: 4px;
background-image: url("../assets/images/detail/side-line-1024.png");
background-image: image-url("detail/side-line-1024.png");
background-repeat: no-repeat;
background-position: left bottom;
}
... ... @@ -896,7 +911,7 @@ $icons: sprite-map('detail-icon/*.png', $spacing:5px);
font-size: 13px;
margin: 0 0 0 4px;
padding: 0 0 0 20px;
background-image: url("../assets/images/detail/map-icon.png");
background-image: image-url("detail/map-icon.png");
background-position: left center;
background-repeat: no-repeat;
line-height: 28px;
... ... @@ -923,7 +938,7 @@ $icons: sprite-map('detail-icon/*.png', $spacing:5px);
position: absolute;
width: 35px;
height: 33px;
background-image: url("../assets/images/detail/play-icon-1024.png");
background-image: image-url("detail/play-icon-1024.png");
left: 50%;
top: 50%;
margin: -18px 0 0 -16px;
... ... @@ -954,7 +969,7 @@ $icons: sprite-map('detail-icon/*.png', $spacing:5px);
line-height: 27px;
font-size: 17px;
padding-bottom: 4px;
background-image: url("../assets/images/detail/side-line-1024.png");
background-image: image-url("detail/side-line-1024.png");
background-repeat: no-repeat;
background-position: left bottom;
}
... ... @@ -979,7 +994,7 @@ $icons: sprite-map('detail-icon/*.png', $spacing:5px);
position: absolute;
width: 20px;
height: 19px;
background-image: url("../assets/images/detail/play-icon-s.png");
background-image: image-url("detail/play-icon-s.png");
left: 50%;
top: 50%;
margin: -10px 0 0 -10px;
... ... @@ -1088,7 +1103,7 @@ $icons: sprite-map('detail-icon/*.png', $spacing:5px);
line-height: 22px;
color: #333333;
font-size: 13px;
background: url("../assets/images/detail/warn.png") no-repeat 10px center;
background: image-url("detail/warn.png") no-repeat 10px center;
}
.login-btn{
margin: 8px 0 0 0;
... ... @@ -1127,13 +1142,13 @@ $icons: sprite-map('detail-icon/*.png', $spacing:5px);
margin: 0;
}
a.sina{
background-image: url("../assets/images/detail/login-sina-icon.png");
background-image: image-url("detail/login-sina-icon.png");
}
a.qq{
background-image: url("../assets/images/detail/login-qq-icon.png");
background-image: image-url("detail/login-qq-icon.png");
}
a.fb{
background-image: url("../assets/images/detail/login-fb-icon.png");
background-image: image-url("detail/login-fb-icon.png");
}
}
}
... ... @@ -1143,7 +1158,7 @@ $icons: sprite-map('detail-icon/*.png', $spacing:5px);
height: 16px;
top: 16px;
right: 16px;
background-image: url("../assets/images/detail/login-close.png");
background-image: image-url("detail/login-close.png");
cursor: pointer;
}
}
... ...
... ... @@ -13,7 +13,7 @@
h2 {
margin: 23px 0 0 0;
height: 70px;
background: url("../assets/images/magazine/mags-title.png") no-repeat center center;
background: image-url("magazine/mags-title.png") no-repeat center center;
}
.mags-text {
margin: 24px auto 0;
... ... @@ -46,7 +46,7 @@
font-size: 17px;
color: #fff;
text-align: center;
background-image: url("../assets/images/magazine/buy-btn-1024.png");
background-image: image-url("magazine/buy-btn-1024.png");
background-position: center center;
background-repeat: no-repeat;
}
... ... @@ -82,7 +82,7 @@
margin: 0 0 0 14px;
width: 10px;
height: 10px;
background-image: url("../assets/images/magazine/slide-ctrl-1024.png");
background-image: image-url("magazine/slide-ctrl-1024.png");
background-size: 100% 100%;
text-indent: -50px;
overflow: hidden;
... ... @@ -91,7 +91,7 @@
margin: 0;
}
.swiper-pagination-switch.swiper-active-switch {
background-image: url("../assets/images/magazine/slide-ctrl-current-1024.png");
background-image: image-url("magazine/slide-ctrl-current-1024.png");
}
}
}
... ... @@ -138,7 +138,7 @@
top: 0;
width: 36px;
height: 15px;
background: url("../assets/images/magazine/special.png");
background: image-url("magazine/special.png");
}
}
img {
... ... @@ -165,7 +165,7 @@
height: 50px;
top: 38%;
margin-top: -18px;
background-image: url("../assets/images/magazine/slide-ctrl-btn-1024.png");
background-image: image-url("magazine/slide-ctrl-btn-1024.png");
z-index: 1;
}
a.slide-ctrl-prev {
... ... @@ -344,7 +344,7 @@
position: absolute;
width: 20px;
height: 34px;
background-image: url("../assets/images/arrow-girl.png");
background-image: image-url("arrow-girl.png");
background-repeat: no-repeat;
top: 50%;
margin-top: -17px;
... ...