Authored by 陈峰

brand css

{
"extends": "stylelint-config-yoho"
}
module.exports = {
extends: 'stylelint-config-yoho',
rules: {
'string-quotes': 'double',
'no-empty-source': null,
'no-descending-specificity': null
}
};
\ No newline at end of file
... ...
... ... @@ -314,7 +314,7 @@ module.exports = class extends global.yoho.BaseModel {
key: res.data.brand_id,
icon: helpers.image(res.data.brand_ico, 80, 50, 3),
title: res.data.brand_name,
content: res.data.brand_intro,
content: _.trim(res.data.brand_intro),
subtitle: 'FEATURED ITEMS',
imgs: imgs
};
... ...
... ... @@ -21,13 +21,13 @@ module.exports = {
cookieDomain: '.yohobuy.com',
domains: {
// test3
singleApi: 'http://api-test3.yohops.com:9999/',
api: 'http://api-test3.yohops.com:9999/',
service: 'http://api-test3.yohops.com:9999/',
serviceNotify: 'http://api-test3.yohops.com:9999/',
global: 'http://global-test-soa.yohops.com:9999/',
platformApi: 'http://192.168.102.48:8088/',
yohoNowApi: 'http://yohonow-test.yohops.com:9999/',
// singleApi: 'http://api-test3.yohops.com:9999/',
// api: 'http://api-test3.yohops.com:9999/',
// service: 'http://api-test3.yohops.com:9999/',
// serviceNotify: 'http://api-test3.yohops.com:9999/',
// global: 'http://global-test-soa.yohops.com:9999/',
// platformApi: 'http://192.168.102.48:8088/',
// yohoNowApi: 'http://yohonow-test.yohops.com:9999/',
// test2
// singleApi: 'http://api-test2.yohops.com:9999/',
... ... @@ -38,11 +38,11 @@ module.exports = {
// platformApi: 'http://192.168.102.48:8088/',
// prod
// singleApi: 'http://api.yoho.cn/',
// api: 'http://api.yoho.cn/',
// service: 'http://api.yoho.cn/',
// serviceNotify: 'http://service.yoho.cn/',
// platformApi: 'http://172.16.6.210:8088/',
singleApi: 'http://api.yoho.cn/',
api: 'http://api.yoho.cn/',
service: 'http://api.yoho.cn/',
serviceNotify: 'http://service.yoho.cn/',
platformApi: 'http://172.16.6.210:8088/',
// gray
// singleApi: 'http://apigray.yoho.cn/',
... ... @@ -113,7 +113,7 @@ module.exports = {
port: '4444' // influxdb port
},
console: {
level: 'info',
level: 'debug',
colorize: 'all',
prettyPrint: true
}
... ...
... ... @@ -19,6 +19,8 @@
{{#dnsPrefetch.hosts}}
<link rel="dns-prefetch" href="{{this}}">
{{/dnsPrefetch.hosts}}
<script src="https://js.fundebug.cn/fundebug.0.3.4.min.js"
apikey="7ed21c1f98779074668264be211e847b0aff71d9ab45486d4c6684384ee26aa3"></script>
<!--[if lt IE 9]>
<script src="//cdn.yoho.cn/yohobuy-node/static/json2.js"></script>
<![endif]-->
... ...
<div class="brands-dialog">
<div class="brands-layer">
<div class="arrow"></div>
<div class="layer-content">
<div class="title">{{title}}</div>
{{#if content}}
<div class="clearfix desc">
<img src="{{image2 icon}}">
<p class="right">{{content}}</p>
<p class="full">{{content}}</p>
</div>
{{/if}}
<div class="featured">
<p>{{subtitle}}</p>
<div class="clearfix">
... ...
... ... @@ -800,12 +800,26 @@
top: -83px;
left: 15px;
width: 325px;
height: 287px;
background: resolve(index/brands-layer.png) no-repeat;
min-height: 200px;
font-weight: normal;
background-color: #fff;
border: 1px solid #ccc;
box-shadow: 1px 1px 3px #ccc;
.arrow {
position: absolute;
left: -12px;
top: 80px;
width: 20px;
height: 20px;
border-left: 1px solid #ccc;
border-bottom: 1px solid #ccc;
background-color: #fff;
transform: rotate(45deg);
}
.layer-content {
padding: 20px 20px 20px 35px;
padding: 20px 20px 20px 20px;
.title {
font-size: 24px;
... ... @@ -836,9 +850,17 @@
line-height: 150%;
max-height: 80px;
}
.full {
font-size: 12px;
line-height: 150%;
max-height: 80px;
}
}
.featured {
margin-top: 10px;
margin-bottom: 5px;
font-size: 16px;
margin-right: -15px;
... ... @@ -853,11 +875,20 @@
}
.brands-layer-right {
background: resolve(index/brands-layer.png) no-repeat 0 -287px;
left: -325px;
top: -83px;
.arrow {
left: initial;
right: -12px;
top: 80px;
border-right: 1px solid #ccc;
border-top: 1px solid #ccc;
border-left: none;
border-bottom: none;
}
.layer-content {
padding: 20px 35px 20px 20px;
padding: 20px 20px 20px 20px;
}
}
... ...