fe / yoho-blk · Commits

Go to a project

Authored by 姜枫
Commit 9f4f5c33a290b4310314c0225633611ae1d89e6d 2 parents c1241e05 bdb71ad6

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

Inline Side-by-side
Showing 16 changed files with 80 additions and 19 deletions
... ... @@ -12,8 +12,8 @@
<div class="thumb-show right">
<img id="main-thumb" src="{{image img 482 643}}" style="display: block;">
<div class="check-btns{{#if btnsHide}} hide{{/if}}">
<span class="iconfont pre-thumb">&#xe62c;</span>
<span class="iconfont next-thumb">&#xe629;</span>
<span class="iconfont pre-thumb">&#xe64e;</span>
<span class="iconfont next-thumb">&#xe64c;</span>
</div>
</div>
<div class="thumb-list hide">
... ...
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 243.422 102.159" enable-background="new 0 0 243.422 102.159" xml:space="preserve">
<g id="XMLID_16_">
<path id="XMLID_2_" fill="#3B95C8" d="M56.974,1.928v70.768h18.478V76H56.974v24.231h-3.359V76H0v-3.442l53.194-70.63H56.974z
M3.92,72.695h49.694V7.298h-0.42L3.92,72.695z"/>
<path id="XMLID_5_" fill="#040000" d="M148.238,17.485c3.919,8.536,6.019,19.688,6.019,33.595c0,13.768-2.1,25.058-6.019,33.594
c-5.459,11.564-14.278,17.485-26.597,17.485c-12.318,0-21.277-5.921-26.597-17.485c-3.92-8.536-5.879-19.688-5.879-33.594
c0-14.044,1.959-25.196,5.879-33.595C100.364,5.783,109.323,0,121.641,0C133.96,0,142.779,5.783,148.238,17.485z M98.124,19
c-3.78,7.985-5.6,18.587-5.6,32.08c0,13.354,1.82,24.094,5.6,32.079c4.899,10.464,12.738,15.695,23.517,15.695
c10.639,0,18.478-5.231,23.518-15.695c3.779-8.123,5.739-18.862,5.739-32.079c0-13.355-1.96-24.095-5.739-32.08
c-5.04-10.464-12.878-15.695-23.518-15.695C110.862,3.305,103.023,8.536,98.124,19z"/>
<path id="XMLID_8_" fill="#3B95C8" d="M224.944,1.928v70.768h18.478V76h-18.478v24.231h-3.359V76h-53.614v-3.442l53.194-70.63
H224.944z M171.891,72.695h49.694V7.298h-0.42L171.891,72.695z"/>
</g>
</svg>
... ...
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 232.923 102.159" enable-background="new 0 0 232.923 102.159" xml:space="preserve">
<g id="XMLID_27_">
<path id="XMLID_2_" fill="#3B95C8" d="M61.593,1.928v3.305H11.059L7,47.638h0.56c2.799-3.718,6.439-6.608,11.199-8.674
c4.339-1.928,8.959-2.892,13.718-2.892c9.519,0,17.218,2.754,23.097,8.398c6.16,5.921,9.239,14.181,9.239,24.783
c0,9.361-3.08,17.21-9.239,23.543c-6.159,6.195-13.998,9.362-23.657,9.362c-8.399,0-15.398-2.341-21.138-6.746
C4.34,90.456,0.7,83.572,0,74.898h3.5c0.56,7.572,3.779,13.63,9.519,18.036c5.18,3.992,11.479,6.058,18.898,6.058
c8.679,0,15.678-2.892,21.278-8.536c5.459-5.782,8.259-12.804,8.259-21.202c0-9.638-2.8-17.21-8.259-22.442
c-5.319-5.094-12.179-7.572-20.718-7.572c-5.459,0-10.499,1.377-15.258,4.13c-4.759,2.754-8.399,6.472-10.639,11.152h-3.5
L7.839,1.928H61.593z"/>
<path id="XMLID_4_" fill="#040000" d="M142.919,17.485c3.919,8.536,6.019,19.688,6.019,33.595c0,13.767-2.1,25.057-6.019,33.593
c-5.459,11.564-14.278,17.485-26.597,17.485c-12.318,0-21.277-5.921-26.597-17.485c-3.92-8.536-5.879-19.688-5.879-33.593
c0-14.044,1.959-25.196,5.879-33.595C95.044,5.783,104.003,0,116.322,0C128.641,0,137.459,5.783,142.919,17.485z M92.805,19
c-3.78,7.985-5.6,18.587-5.6,32.08c0,13.354,1.82,24.093,5.6,32.079c4.899,10.464,12.738,15.695,23.517,15.695
c10.639,0,18.478-5.231,23.518-15.695c3.779-8.123,5.739-18.862,5.739-32.079c0-13.355-1.96-24.095-5.739-32.08
C134.8,8.536,126.961,3.305,116.322,3.305C105.543,3.305,97.704,8.536,92.805,19z"/>
<path id="XMLID_7_" fill="#040000" d="M226.904,17.485c3.919,8.536,6.019,19.688,6.019,33.595c0,13.767-2.1,25.057-6.019,33.593
c-5.46,11.564-14.278,17.485-26.598,17.485c-12.318,0-21.277-5.921-26.597-17.485c-3.92-8.536-5.879-19.688-5.879-33.593
c0-14.044,1.959-25.196,5.879-33.595C179.029,5.783,187.988,0,200.307,0C212.626,0,221.444,5.783,226.904,17.485z M176.79,19
c-3.78,7.985-5.6,18.587-5.6,32.08c0,13.354,1.819,24.093,5.6,32.079c4.899,10.464,12.738,15.695,23.517,15.695
c10.639,0,18.479-5.231,23.518-15.695c3.779-8.123,5.739-18.862,5.739-32.079c0-13.355-1.96-24.095-5.739-32.08
c-5.039-10.464-12.879-15.695-23.518-15.695C189.528,3.305,181.689,8.536,176.79,19z"/>
</g>
</svg>
... ...
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="1371.6796875" height="200" viewBox="0 0 1371.6796875 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"><![CDATA[
@font-face { font-family: ifont; src: url("//at.alicdn.com/t/font_1442373896_4754455.eot?#iefix") format("embedded-opentype"), url("//at.alicdn.com/t/font_1442373896_4754455.woff") format("woff"), url("//at.alicdn.com/t/font_1442373896_4754455.ttf") format("truetype"), url("//at.alicdn.com/t/font_1442373896_4754455.svg#ifont") format("svg"); }
]]></style></defs><g class="transform-group"><g transform="scale(0.1953125, 0.1953125)"><path d="M1346.600908 0.01535c-257.761441 0-466.72443 208.955313-466.72443 466.72443s208.955313 466.72443 466.72443 466.72443 466.72443-208.955313 466.72443-466.72443S1604.36235 0.01535 1346.600908 0.01535zM1346.600908 753.643676c-158.452982 0-286.903896-128.450914-286.903896-286.903896s128.450914-286.903896 286.903896-286.903896 286.903896 128.450914 286.903896 286.903896S1505.053891 753.643676 1346.600908 753.643676zM3515.530198 0.01535c-257.761441 0-466.72443 208.955313-466.72443 466.72443s208.955313 466.72443 466.72443 466.72443 466.72443-208.955313 466.72443-466.72443S3773.29164 0.01535 3515.530198 0.01535zM3515.530198 753.643676c-158.452982 0-286.903896-128.450914-286.903896-286.903896s128.450914-286.903896 286.903896-286.903896c158.452982 0 286.903896 128.450914 286.903896 286.903896S3673.983181 753.643676 3515.530198 753.643676zM4216.476457 0.01535l179.812859 0 0 735.683881-179.812859 0 0-735.683881ZM4396.289316 801.29086 4216.476457 801.29086 4327.320631 1024 4457.222144 1024ZM586.824806 0.01535 396.635177 331.488705 206.998156 0.01535 0 0.01535 306.414067 533.214049 306.414067 933.456535 486.234601 933.456535 486.234601 533.237074 793.884363 0.01535ZM2611.02424 347.215038 2251.122217 347.215038 2251.122217 0.01535 2071.301683 0.01535 2071.301683 933.456535 2251.122217 933.456535 2251.122217 527.027897 2611.02424 527.027897 2611.02424 933.456535 2790.837098 933.456535 2790.837098 0.01535 2611.02424 0.01535ZM5228.78724 424.672413c37.232038-43.525641 56.051447-94.979688 56.051447-153.379724 0-37.922799-8.17401-75.853273-24.2841-112.571077-15.818435-36.579652-37.615794-67.648563-65.00832-92.562023-27.215998-24.215023-60.794675-41.576159-99.707566-51.615224-36.963408-9.655309-86.690551-14.536689-147.807582-14.536689l-156.296272 0 0 933.44886 225.848266 0c62.345051 0 115.257372-5.894497 158.038526-17.721867 40.163936-12.564182 76.789639-35.167429 108.626062-66.980827 53.403529-52.175509 80.489049-116.869148 80.489049-192.31564 0-57.394594-15.304202-108.580012-45.321621-151.975176C5296.036697 469.878907 5265.658547 443.154117 5228.78724 424.672413zM5084.272287 354.398957c-18.635207 17.744892-50.179976 26.72479-93.705617 26.72479l-19.018963 0 0-212.209567 24.191998 0c39.112444 0 68.730756 8.918497 88.018348 26.479186 18.949887 17.269034 28.160038 42.83488 28.160038 78.178836C5111.918092 310.297681 5102.869118 336.730816 5084.272287 354.398957zM4971.547707 539.100871l44.891814 0c65.768157 0 111.043727 10.92938 134.62939 32.596261 23.946394 21.682232 35.57421 47.71626 35.57421 79.568034 0 32.749764-12.049948 59.029396-36.602677 80.128319-24.01547 20.093481-63.933802 30.286048-118.657453 30.286048l-59.835285 0L4971.547707 539.100871zM5805.941387 0.01535 5626.128528 0.01535 5626.128528 933.456535 6066.918707 933.456535 6066.918707 761.687209 5805.941387 761.687209ZM7022.778935 0.01535 6779.001574 0.01535 6466.148076 320.689802 6466.148076 0.01535 6286.327542 0.01535 6286.327542 933.456535 6466.148076 933.456535 6466.148076 552.678169 6468.987873 549.830698 6779.469757 933.456535 7018.657393 933.456535 6597.239233 426.176738Z" fill="#272636"></path></g></g></svg>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 173 196.5" style="enable-background:new 0 0 173 196.5;" xml:space="preserve">
<style type="text/css">
.st0{fill:#B0B0B0;}
</style>
<path id="XMLID_3_" class="st0" d="M173,196.5H0V51.6h173V196.5z M4,192.5h165V55.6H4V192.5z"/>
<path id="XMLID_2_" class="st0" d="M132.5,52.4h-4V46c0-23.2-18.9-42-42-42c-23.2,0-42,18.9-42,42v6.3h-4V46c0-25.4,20.6-46,46-46
c25.4,0,46,20.6,46,46V52.4z"/>
</svg>
... ...
... ... @@ -5,7 +5,7 @@
.err-404-img {
width: 244px;
height: 105px;
background: resolve('layout/404.png') no-repeat center center;
background: resolve("layout/404.svg") no-repeat center center;
margin: 0 auto;
}
... ... @@ -39,7 +39,7 @@
.err-500-img {
width: 244px;
height: 105px;
background: resolve('layout/500.png') no-repeat center center;
background: resolve("layout/500.svg") no-repeat center center;
margin: 0 auto;
}
}
... ...
... ... @@ -55,7 +55,6 @@
a:hover {
color: #9a9a9a;
}
}
}
... ... @@ -129,7 +128,7 @@
display: inline-block;
width: 138px;
height: 138px;
background-image: resolve('layout/qr.png');
background-image: resolve("layout/qr.png");
}
p {
... ... @@ -157,7 +156,8 @@
padding: 280px 0 130px;
text-align: center;
color: #1b1b1b;
background: resolve('layout/empty-bag.png') no-repeat center center;
background: resolve("layout/empty-bag.svg") no-repeat center 30%;
background-size: 115px 130px;
display: none;
}
... ... @@ -195,7 +195,6 @@
.bag-content {
display: block;
}
}
.goods-item {
... ... @@ -270,13 +269,14 @@
}
.main-logo {
width: 264px;
height: 40px;
width: 200px;
height: 30px;
left: 50%;
position: absolute;
margin-left: -132px;
margin-top: 20px;
background: resolve('layout/blk-logo.png') no-repeat center center;
background: resolve("layout/blk-logo.svg") no-repeat center center;
background-size: 100%;
a {
display: block;
... ... @@ -436,7 +436,7 @@
width: 26px;
height: 12px;
display: inline-block;
background: url('/layout/hot.png');
background: url("/layout/hot.png");
margin-left: 4px;
}
... ...
... ... @@ -8,8 +8,9 @@
.main-logo {
width: 200px;
height: 80px;
background: resolve('layout/sign-logo.png') no-repeat center center;
background: resolve("layout/blk-logo.svg") no-repeat center center;
display: inline-block;
background-size: 100%;
> a {
display: inline-block;
... ...
... ... @@ -6,6 +6,7 @@
clear: both;
margin-bottom: 20px;
}
select {
width: 60px;
}
... ... @@ -45,6 +46,7 @@
.input-radio {
line-height: 26px;
padding-right: 10px;
.iconfont {
font-size: 14px;
}
... ... @@ -62,7 +64,6 @@
margin-right: 5px;
}
}
}
.user-icon {
... ... @@ -82,7 +83,8 @@
width: 120px;
background-image: resolve('me/setting/default-head.png');
background-repeat: no-repeat;
background-size: 120px 120px;
background-size: 110px 110px;
background: #fff;
}
.edit-ico {
... ...
... ... @@ -5,10 +5,10 @@
text-align: center;
.empty-cart-bg {
background: resolve('layout/bag-bg.png') no-repeat center center;
width: 163px;
height: 198px;
margin: 0 auto;
background: resolve("layout/empty-bag.svg") no-repeat center center;
width: 115px;
height: 130px;
margin: 0 auto 30px;
}
.empty-cart-info {
... ...