fe / yoho-blk · Commits

Go to a project

Authored by 郝肖肖
Commit 5e99d65c2e8d41579887fc1523b539db3ed828b1 2 parents 93488d4d 9c95146b

Merge branch 'feature/wsl5.3' of git.yoho.cn:fe/yoho-blk into feature/wsl5.3

Inline Side-by-side
Showing 31 changed files with 230 additions and 184 deletions
... ... @@ -8,7 +8,7 @@
<a href="{{https url}}" target="_blank">
<img class="lazy-img" data-original="{{image src 395 495}}" alt="{{alt}}">
</a>
<div class="editorial-title"><div><p>{{title}}</p></div></div>
<div class="editorial-title"><p>{{title}}</p></div>
</span>
{{/ big}}
</div>
... ... @@ -18,7 +18,7 @@
<a href="{{https url}}" target="_blank">
<img class="lazy-img" data-original="{{image src 360 240}}" alt="{{alt}}">
</a>
<div class="editorial-title"><div><p>{{title}}</p></div></div>
<div class="editorial-title"><p>{{title}}</p></div>
</span>
{{/ small}}
</div>
... ...
... ... @@ -122,13 +122,13 @@
<ul class="clearfix">
<li id="prise-btn" class="like-status{{# isLike}} liked{{/ isLike}}">
<a href="javascript:;">
<i class="iconfont">&#xe60e;</i>
<i class="iconfont">&#xe6b7;</i>
<span class="like-num">{{likeNum}}</span>
</a>
</li>
<li id="collect-btn" class="sort-collect{{# isCollected}} collected{{/ isCollected}}">
<a href="javascript:;">
<i class="iconfont">&#xe627;</i>
<i class="iconfont">&#xe6b5;</i>
<span>收藏</span>
</a>
</li>
... ...
<div class="content-msg clearfix" data-id="{{id}}">
<div class="msg-left"><i class="iconfont">&#xe606;</i> <span class="time-word font brown-light">{{publish_time}}</span></div>
<div class="msg-left"><i class="iconfont">&#xe6b1;</i> <span class="time-word font brown-light">{{publish_time}}</span></div>
<div class="msg-right">
<a class="msg-title" href="/editorial/{{id}}.html" target="_blank">{{title}}</a>
<a href="/editorial/{{id}}.html" target="_blank">
... ... @@ -8,7 +8,7 @@
<div class="content">{{intro}}</div>
<div class="msg-app">
<span class="like-comment">
<i class="iconfont like-icon {{#if isPraise}}liked{{/if}}">&#xe60e;</i>
<i class="iconfont like-icon {{#if isPraise}}liked{{/if}}">&#xe6b7;</i>
<b class="like-num brown-light font">{{praise_num}}</b>
</span>
</div>
... ...
... ... @@ -90,7 +90,7 @@
{{!-- 在线客服和返回顶部 --}}
<div class="service-top">
<a class="service" href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank">
<span class="iconfont hide">&#xe61c;</span>
<span class="iconfont hide">&#xe6b8;</span>
<span class="hover-text">在线<br>客服</span>
</a>
<div class="return-top hide">
... ...
... ... @@ -22,7 +22,7 @@
{{#if showLeftTime}}
<div class="time">
<span>剩余支付时间：</span>
<span class="iconfont hide-when-invalid">&#xe606;</span>
<span class="iconfont hide-when-invalid">&#xe6b1;</span>
<p class="left-time" data-left={{pay_lefttime}}></p>
<span class="tip hide-when-invalid">（逾期订单将自动取消）</span>
</div>
... ...
... ... @@ -23,7 +23,7 @@
<div class="pay-operation {{#unless showLeftTime}}marginhack{{/unless}}">
{{#if isOnlinePaid}}
{{#if showLeftTime}}
<span class="iconfont hide-when-invalid">&#xe606;</span><p class="left-time" data-left="{{pay_lefttime}}"></p>
<span class="iconfont hide-when-invalid">&#xe6b1;</span><p class="left-time" data-left="{{pay_lefttime}}"></p>
{{/if}}
<a href="{{https payUrl}}">
<span class="btn red hide-when-invalid ">立即付款</span>
... ...
... ... @@ -124,11 +124,11 @@ const ShopService = {
let info = {};
let favType = 'brand';
let domainInfo = yield BrandService.getDomainInfo(domain);
if (shopId) {
info.shopId = shopId;
} else {
let domainInfo = yield BrandService.getDomainInfo(domain);
info.brandId = domainInfo.id;
info.shopId = domainInfo.shop_id;
info.brandBanner = domainInfo.brand_banner;
... ... @@ -172,6 +172,8 @@ const ShopService = {
info.isFavorite = info.isFavorite || (brandInfo.is_favorite === 'Y');
info.banner = info.banner || info.brandBanner;
}
info.brandId = domainInfo.id; // 如果是店铺最后赋值brandId
info.favType = favType;
return info;
})();
... ...
... ... @@ -133,7 +133,7 @@
{{/if}}
{{#if addToBag}}
<span id="add-to-bag" class="btn">
<i class="iconfont">&#xe64b;</i>
<i class="iconfont">&#xe6b2;</i>
加入购物袋
</span>
{{/if}}
... ... @@ -141,11 +141,11 @@
<span id="sold-out" class="btn disable{{#unless soldOut}} hide{{/unless}}">已售罄</span>
<span id="collect-product" class="btn white{{#if productFav}} coll{{/if}}">
<span class="collecting">
<i class="iconfont">&#xe644;</i>
<i class="iconfont">&#xe6b3;</i>
收藏商品
</span>
<span class="collected">
<i class="iconfont">&#xe627;</i>
<i class="iconfont">&#xe6b5;</i>
<em>已收藏</em>
<em class="cal-col">取消收藏</em>
</span>
... ...
... ... @@ -64,14 +64,14 @@
<div class="goods-wrap">
{{#each hotProducts}}
<div class="goods-info" data-skn="{{product_skn}}">
<a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" target="_blank">
<div class="goods-info" data-skn="{{productSkn}}">
<a href="/product/pro_{{productId}}_{{goodsId}}/{{cnAlphabet}}.html" target="_blank">
<img class="lazy thumb" data-original="{{src}}">
</a>
<div class="desc-cover"></div>
<div class="desc">
<a class="name" href="" target="_blank">{{product_name}}</a>
<p class="price">¥{{round sales_price 2}}</p>
<a class="name" href="" target="_blank">{{productName}}</a>
<p class="price">¥{{round salesPrice 2}}</p>
</div>
</div>
{{/each}}
... ...
{{# banner}}
<div class="brand-banner" data-brand="{{brandId}}" data-shop="{{shopId}}" data-type="{{favType}}">
<div class="brand-banner-bg"></div>
<div class="brand-img" style="height:150px; background: url('{{image banner 1150 150}}')"></div>
{{#if showShopName}}
... ... @@ -7,14 +8,14 @@
{{/if}}
<p class="opts">
<span id="brand-fav" class="brand-fav{{#if isFavorite}} coled{{/if}}">
<i class="iconfont">&#xe6b5;</i>
</span>
<a id="brand-info">
<i class="iconfont">&#xe64f;</i>
{{btnName}}
<i class="iconfont">&#xe61f;</i>
</a>
<span id="brand-fav" class="brand-fav{{#if isFavorite}} coled{{/if}}">
<i class="iconfont">&#xe627;</i>
</span>
</p>
</div>
{{/banner}}
... ...
... ... @@ -24,7 +24,7 @@
{{/ brandIntro}}
<span id="brand-fav" class="brand-fav{{#if brandFav}} coll{{/if}}" data-id={{brandId}}>
<i class="iconfont">&#xe627;</i>
<i class="iconfont">&#xe6b5;</i>
</span>
</p>
</div>
... ...
... ... @@ -41,7 +41,7 @@
</li>
<li class="tag-bag">
<a href="{{../siteUrl}}/shopping/cart">
<span class="iconfont tools-icon icon-bag">&#xe64b;</span>
<span class="iconfont tools-icon icon-bag">&#xe6b2;</span>
购物袋
</a>
<div class="mini-bag-box-wrap">
... ...
<span class="iconfont">&#xe606;</span>
\ No newline at end of file
<span class="iconfont">&#xe6b1;</span>
\ No newline at end of file
... ...
<span class="iconfont">&#xe60e;</span>
\ No newline at end of file
<span class="iconfont">&#xe6b7;</span>
\ No newline at end of file
... ...
No preview for this file type
... ... @@ -2,7 +2,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>
Created by FontForge 20120731 at Tue Nov 29 16:36:10 2016
Created by FontForge 20120731 at Wed Dec 7 10:46:30 2016
By admin
</metadata>
<defs>
... ... @@ -16,10 +16,10 @@ Created by FontForge 20120731 at Tue Nov 29 16:36:10 2016
ascent="896"
descent="-128"
x-height="792"
bbox="-57 -212 1506 949"
bbox="-57 -212 1678 949"
underline-thickness="0"
underline-position="0"
unicode-range="U+0078-E6A2"
unicode-range="U+0078-E6B8"
/>
<missing-glyph
/>
... ... @@ -293,5 +293,34 @@ q16 -16 16 -39t-16 -39l-38 -38q-16 -16 -39 -16t-39 16v0z" />
<glyph glyph-name="gouwudai" unicode="&#xe6a2;" horiz-adv-x="1059"
d="M978 -26q-10 -53 -47 -77.5t-83 -24.5h-651q-9 0 -21.5 2.5t-33 10.5t-37.5 28t-22 49q-73 356 -83 496q-2 29 8.5 52t25.5 35.5t32.5 20.5t27.5 10t12 2h847q5 0 12.5 -1.5t26.5 -9.5t33 -19t25 -32t9 -48q-1 -23 -4 -48t-7 -55.5t-7.5 -54.5t-10 -60.5t-10 -56.5
t-11.5 -60.5t-10.5 -54.5t-11 -56t-9.5 -48zM105 473l57 -495h700l92 495h-849zM600 790h-141l-124 -212h-123q89 135 138 232q22 44 51 65t76 21h110q20 0 35.5 -4t24.5 -7t19.5 -14.5t13.5 -15t13 -20t11 -18.5q27 -41 62.5 -101t58.5 -99l22 -39h-123z" />
<glyph glyph-name="tian" unicode="&#xe6af;"
d="M512 -128q-138 0 -256 69t-187 187t-69 256t69 256t187 187t256 69q87 0 170.5 -29.5t151.5 -84.5q14 -11 15.5 -29t-9.5 -30q-11 -15 -29 -16.5t-30 9.5q-115 95 -269 95q-115 0 -214 -57t-156 -156t-57 -214t57 -214t156 -156t214 -57t214 57t156 156t57 214
q0 93 -38 176q-7 16 -1 32t22 23t32.5 0.5t22.5 -22.5q45 -98 45 -209q1 -104 -39.5 -198.5t-109 -163t-163 -109.5t-198.5 -41zM717 612v-12l-10 -15q-16 -25 -53 -89q-31 -61 -36 -74q-4 -9 -30 -80q-13 -39 -36 -136q-9 -54 -10 -70h-113q6 34 22 70q5 13 31 66
q47 82 132 197l40 55h-212q-38 0 -55 -9q-15 -7 -29 -29q-9 -19 -15 -66h-13l23 195h364v-3z" />
<glyph glyph-name="tian_cha" unicode="&#xe6b0;" horiz-adv-x="1158"
d="M497 -97q-69 0 -133 18q-95 26 -172.5 87t-127 147t-61 184t15.5 193q28 96 88.5 173.5t147.5 126.5q86 49 184 60.5t193 -15.5q130 -37 223.5 -134t125.5 -227q5 -17 -4.5 -31.5t-26.5 -17.5q-17 -5 -31.5 4t-17.5 26q-26 109 -104.5 190t-186.5 112q-80 21 -161.5 11
t-154.5 -50q-72 -40 -123 -105t-74 -145q-44 -164 39 -314q40 -72 105 -122.5t145 -72.5q88 -25 175 -10q16 3 30 -7.5t17 -27.5t-7.5 -30.5t-27.5 -16.5q-40 -6 -76 -6zM696 620v-12l-10 -14q-16 -25 -52 -86q-29 -60 -34 -72q-5 -9 -29 -78q-13 -38 -35 -131
q-9 -53 -10 -68h-109q5 33 21 68q5 12 30 63q46 80 127 191l39 53h-205q-37 0 -53 -8q-14 -7 -29 -29q-8 -18 -14 -63h-4l22 188h345v-2zM901 -128q-106 0 -181 75t-75 181.5t75 182.5t181 76t181 -75.5t75 -181.5t-75 -182t-181 -76zM901 305q-72 0 -123 -51t-51 -123.5
t51 -123.5t123 -51t123 51t51 123.5t-51 123.5t-123 51zM749.5 -66q-16.5 0 -29 12t-12.5 28.5t13 28.5l305 306q12 12 28.5 12t29 -12.5t12.5 -28.5t-13 -29l-305 -305q-12 -12 -28.5 -12z" />
<glyph glyph-name="time" unicode="&#xe6b1;"
d="M512 896q-138 0 -256 -69t-187 -187t-69 -256t69 -256t187 -187t256 -69t256 69t187 187t69 256t-69 256t-187 187t-256 69zM583 390q0 -30 -20.5 -50.5t-50.5 -20.5h-216q-30 0 -50.5 20.5t-20.5 50.5t20.5 50.5t50.5 20.5h145v185q0 30 20.5 50.5t50.5 20.5t50.5 -20.5
t20.5 -50.5v-256z" />
<glyph glyph-name="bag1" unicode="&#xe6b2;"
d="M725 587h-99v81q0 54 -33.5 93t-80.5 39t-80.5 -39t-33.5 -93v-81h-96v81q0 94 62 161t148 67t148 -67t62 -161v-81h3zM962 16l-39 556q0 15 -15 15h-789q-7 0 -12.5 -6t-5.5 -12l-33 -556l-42 -135q0 -3 18 -3h939l15 3z" />
<glyph glyph-name="xin_kong" unicode="&#xe6b3;" horiz-adv-x="1051"
d="M756 796q87 0 141 -64.5t54 -158.5q0 -78 -50 -145l-375 -408l-376 408q-50 61 -50 145q0 94 54.5 158.5t140.5 64.5q42 0 86 -22.5t74.5 -52t50.5 -57.5t20 -41q0 13 20 41t50.5 57.5t74.5 52t85 22.5zM756 896q-117 0 -225 -100l-3 -3q-116 103 -233 103
q-125 0 -210 -93t-85 -230q0 -116 73 -208l2 -2l3 -3l375 -408l73 -80l72 80l376 408l2 3l3 2q73 88 73 208q0 137 -85 230t-211 93z" />
<glyph glyph-name="zheng" unicode="&#xe6b4;"
d="M512 -128q-9 0 -17 4l-405 184q-26 11 -26 38v670q0 29 30 41q1 0 33 9.5t78 22t99.5 25.5t110 21.5t97.5 8.5t97.5 -8.5t110 -21.5t99.5 -25.5t78 -22t33 -9.5q13 -5 21.5 -16.5t8.5 -24.5v-670q0 -27 -26 -38l-405 -184q-8 -4 -17 -4zM149 126l363 -164l363 164v610
q-254 75 -363 75t-363 -75v-610zM755 243v-62h-486v62h66v237h66v-237h92v320h-205v62h452v-62h-179v-117h152v-62h-152v-141h194z" />
<glyph glyph-name="xin" unicode="&#xe6b5;" horiz-adv-x="1051"
d="M756 896q-117 0 -225 -100l-3 -3q-116 103 -233 103q-125 0 -210 -93t-85 -230q0 -116 73 -208l2 -2l3 -3l375 -408l73 -80l72 80l376 408l2 3l3 2q73 88 73 208q0 137 -85 230t-211 93z" />
<glyph glyph-name="yanjing" unicode="&#xe6b6;" horiz-adv-x="1678"
d="M1650 431q-124 216 -342.5 340.5t-468.5 124.5t-468.5 -124.5t-342.5 -340.5l-28 -47l28 -47q129 -215 346 -340t465 -125q250 0 468.5 124.5t342.5 340.5l28 47zM839.5 612q92.5 0 160 -68t67.5 -160t-67.5 -160t-160 -68t-160 68t-67.5 160t67.5 160t160 68z" />
<glyph glyph-name="zan" unicode="&#xe6b7;" horiz-adv-x="1025"
d="M0 -128h208v614h-208v-614zM259 -128h586q39 0 68.5 24t36.5 62l74 461q7 46 -24.5 82.5t-81.5 36.5h-294l54 108q23 44 18.5 88t-25.5 80t-61.5 59t-87.5 23l-263 -410v-614zM918 538z" />
<glyph glyph-name="zaixiankefu1" unicode="&#xe6b8;" horiz-adv-x="1039"
d="M1037 49h-86v327q0 89 -34.5 169t-92.5 138t-137.5 92.5t-166.5 34.5q-118 0 -218 -58t-158 -158t-58 -218v-329h-86v329q0 106 41 202t111 166t166 111t201.5 41t202 -41t166 -111t110.5 -166t41 -202v-327h-2zM269 282h-32q-45 0 -76.5 -31.5t-31.5 -76.5v-194
q0 -45 31.5 -76.5t76.5 -31.5h32q46 0 77 31.5t31 76.5v194q0 45 -31 76.5t-77 31.5zM800 282h-33q-45 0 -76 -31.5t-31 -76.5v-194q0 -45 31 -76.5t76 -31.5h33q45 0 76.5 31.5t31.5 76.5v194q0 45 -31.5 76.5t-76.5 31.5z" />
</font>
</defs></svg>
... ...
No preview for this file type
No preview for this file type
... ... @@ -15,7 +15,7 @@
line-height: 40px;
padding-right: 20px;
display: -webkit-box;
font-size: 16px;
font-size: 18px;
font-weight: bold;
overflow: hidden;
-webkit-line-clamp: 1;
... ... @@ -26,7 +26,7 @@
p {
display: -webkit-box;
height: calc($size*$line-height*$lines-to-show);
margin: 25px 0;
margin: 8px 0;
padding-right: 20px;
font-size: $size;
line-height: 24px;
... ... @@ -43,10 +43,12 @@
bottom: 50px;
background-color: white;
outline: none;
border: 1px solid black;
border: none;
font-size: 14px;
font-weight: bold;
cursor: pointer;
text-align: left;
color: #1b1b1b;
padding: 0;
}
}
... ...
... ... @@ -33,29 +33,23 @@
height: 70px;
position: absolute;
bottom: 0;
background-color: rgba(0, 0, 0, 0.5);
background: url("/channel/jb-bg.png") repeat-x;
color: #fff;
font-size: 14px;
line-height:70px;
line-height: 70px;
padding: 0 $space;
div{
line-height: 1.6;
display: inline-block;
vertical-align: middle;
}
p{
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
word-break: break-all;
p {
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
img {
@extend .cursor-pointer;
display: inline-block;
}
... ...
... ... @@ -15,6 +15,13 @@
background-position: center;
background-repeat: no-repeat;
}
&:hover {
.slide-switch a {
background: #000;
opacity: 0.9;
}
}
}
.slide-pagination {
... ... @@ -81,13 +88,11 @@
position: absolute;
top: 50%;
margin: -35px 0 0;
width: 40px;
height: 70px;
line-height: 70px;
width: 28px;
height: 50px;
line-height: 50px;
text-align: center;
z-index: 2;
background: #000;
opacity: 0.55;
&.prev {
left: 50%;
... ... @@ -99,12 +104,8 @@
margin-right: -615px;
}
&:hover {
opacity: 0.9;
}
.iconfont {
font-size: 34px;
font-size: 24px;
color: #fff;
}
}
... ... @@ -162,18 +163,18 @@
span {
position: relative;
display: inline-block;
margin: 0 3px;
width: 10px;
height: 10px;
margin: 0 5px;
width: 8px;
height: 8px;
background: #ccc;
cursor: pointer;
z-index: 2;
&.focus {
width: 16px;
height: 16px;
width: 10px;
height: 10px;
position: relative;
top: 3px;
top: 1px;
background: #fff;
}
}
... ... @@ -245,6 +246,7 @@
left: 0;
margin-left: 0;
}
a.next {
right: 0;
margin-right: 0;
... ...
.new-arrival {
$textHeight: 47px;
$textHeight: 38px;
$imgHeight: 496px;
@extend .resource-container;
... ... @@ -25,7 +25,6 @@
@extend .cursor-pointer;
padding-bottom: 3px;
border-bottom: 2px solid #000;
&.top {
line-height: 30px;
... ...
... ... @@ -44,6 +44,7 @@
border: none;
padding-top: 35px !important;
padding-bottom: 50px !important;
background: #f5f7f6;
p {
height: calc($size*$line-height*$lines-to-show);
... ... @@ -60,7 +61,9 @@
button {
width: 120px;
left: calc($width/2-$buttonWidth/2); /* stylelint-disable-line */
left: 20px;
font-family: "微软雅黑" !important;
background-color: #f5f7f6;
}
p,
... ... @@ -82,8 +85,6 @@
height: 100%;
float: left;
padding: 25px 0 25px $space;
border: 1px solid #bbb;
border-left: none;
p,
h4 {
... ... @@ -92,6 +93,5 @@
}
}
}
}
}
... ...
... ... @@ -14,4 +14,5 @@
.zh-size {
font-size: 14px;
line-height: 24px;
color: #999;
}
... ...
... ... @@ -306,7 +306,7 @@
display: inline-block;
font-style: normal;
margin: 0 5px 0 0;
font-size: 20px;
font-size: 18px;
opacity: 0.5;
}
}
... ... @@ -317,7 +317,7 @@
.like-status.liked i,
.like-status.hover i {
opacity: 1;
opacity: 0.5;
}
.like-statis.hover .like-num {
... ... @@ -327,6 +327,8 @@
.sort-collect a {
i {
width: 21px;
position: relative;
top: 2px;
}
}
... ... @@ -365,7 +367,7 @@
font-size: 18px;
font-style: normal;
position: relative;
top:6px;
top: 6px;
}
ul {
... ... @@ -412,7 +414,7 @@
font-size: 12px;
}
span{
span {
font-size: 14px;
}
}
... ...
.content-msg {
margin-top: 40px;
margin-left: 110px;
.msg-left {
position: relative;
float: left;
width: 200px;
height: 30px;
margin-right: 90px;
line-height: 30px;
text-align: center;
border-bottom: 1px solid #bbb;
color: #999;
}
.msg-right {
float: left;
width: 643px;
border-bottom: 1px solid #eee;
margin-top: 2px;
padding-bottom: 5px;
a {
img {
margin-top: 10px;
}
}
}
.msg-title {
font-size: 20px;
color: #1b1b1b;
line-height: 30px;
max-height: 64px;
overflow: hidden;
word-wrap: break-word;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.msg-title:hover {
color: #666;
}
.lazy {
width: 640px;
height: 430px;
margin-top: 15px;
}
.content {
display: block;
font-size: 14px;
line-height: 24px;
word-wrap: break-word;
margin-top: 15px;
overflow: hidden;
word-wrap: break-word;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.msg-app {
height: 50px;
line-height: 50px;
font-size: 14px;
}
.time {
color: #a6a6a6;
margin-left: 3px;
}
.iconfont {
font-size: 14px;
margin-top: 0;
}
.time-word {
font-weight: normal;
}
.like-comment {
color: #999;
cursor: pointer;
font-size: 14px;
.like-icon {
cursor: pointer;
&.liked {
color: #000;
}
}
}
.like-num {
font-weight: normal;
}
}
.content-msg {
margin-top: 40px;
margin-left: 110px;
.msg-left {
position: relative;
float: left;
width: 200px;
height: 30px;
margin-right: 90px;
line-height: 30px;
text-align: center;
border-bottom: 1px solid #bbb;
color: #999;
}
.msg-right {
float: left;
width: 643px;
border-bottom: 1px solid #eee;
margin-top: 2px;
padding-bottom: 5px;
a {
img {
margin-top: 10px;
}
}
}
.msg-title {
font-size: 20px;
color: #1b1b1b;
line-height: 30px;
max-height: 64px;
overflow: hidden;
word-wrap: break-word;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.msg-title:hover {
color: #666;
}
.lazy {
width: 640px;
height: 430px;
margin-top: 15px;
}
.content {
display: block;
font-size: 14px;
line-height: 24px;
word-wrap: break-word;
margin-top: 15px;
overflow: hidden;
word-wrap: break-word;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.msg-app {
height: 50px;
line-height: 50px;
font-size: 14px;
}
.time {
color: #a6a6a6;
margin-left: 3px;
}
.iconfont {
font-size: 14px;
margin-top: 0;
}
.time-word {
font-weight: bold;
font-size: 14px;
}
.like-comment {
color: #999;
cursor: pointer;
font-size: 14px;
.like-icon {
cursor: pointer;
&.liked {
color: #000;
}
}
}
.like-num {
font-weight: normal;
}
}
... ...
... ... @@ -3,7 +3,6 @@
height: 327px;
width: 100%;
overflow: hidden;
}
.slide-pagination {
... ... @@ -46,8 +45,6 @@
line-height: 56px;
text-align: center;
z-index: 2;
background: #000;
opacity: 0.55;
&:hover {
opacity: 0.9;
... ...
... ... @@ -10,6 +10,15 @@
background-size: 100% 100%;
position: relative;
.brand-banner-bg {
width: 100%;
height: 150px;
position: absolute;
top: 0;
z-index: 3;
background: resolve("product/shop-banner-bg.png") repeat-y;
}
.shop-name {
display: block;
position: absolute;
... ... @@ -25,29 +34,36 @@
right: 20px;
bottom: 20px;
font-size: 14px;
z-index: 4;
a,
.brand-fav {
color: #fff;
border: 1px solid #fff;
padding: 10px;
margin-left: 10px;
margin-left: 6px;
cursor: pointer;
display: inline-block;
line-height: 12px;
height: 32px;
.iconfont {
font-size: 12px;
font-size: 15px;
position: relative;
top: 1px;
}
}
.brand-fav.coled .iconfont {
color: #fc0d1b;
font-size: 12px;
font-size: 15px;
}
#brand-info {
font-size: 14px;
}
#brand-info i {
font-weight: bold;
font-size: 12px;
}
}
... ...