Showing
15 changed files
with
84 additions
and
34 deletions
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | <a href="{{url}}" target="_blank"> | 8 | <a href="{{url}}" target="_blank"> |
| 9 | <img class="lazy-img" data-original="{{image src 395 495}}" alt="{{alt}}"> | 9 | <img class="lazy-img" data-original="{{image src 395 495}}" alt="{{alt}}"> |
| 10 | </a> | 10 | </a> |
| 11 | - <p class="editorial-title">{{title}}</p> | 11 | + <div class="editorial-title"><div><p>{{title}}</p></div></div> |
| 12 | </span> | 12 | </span> |
| 13 | {{/ big}} | 13 | {{/ big}} |
| 14 | </div> | 14 | </div> |
| @@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
| 18 | <a href="{{url}}" target="_blank"> | 18 | <a href="{{url}}" target="_blank"> |
| 19 | <img class="lazy-img" data-original="{{image src 360 240}}" alt="{{alt}}"> | 19 | <img class="lazy-img" data-original="{{image src 360 240}}" alt="{{alt}}"> |
| 20 | </a> | 20 | </a> |
| 21 | - <p class="editorial-title">{{title}}</p> | 21 | + <div class="editorial-title"><div><p>{{title}}</p></div></div> |
| 22 | </span> | 22 | </span> |
| 23 | {{/ small}} | 23 | {{/ small}} |
| 24 | </div> | 24 | </div> |
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | </div> | 19 | </div> |
| 20 | {{^}} | 20 | {{^}} |
| 21 | <div class="page page-pre"> | 21 | <div class="page page-pre"> |
| 22 | - <span class="iconfont "></span> | 22 | + <span class="iconfont"></span> |
| 23 | </div> | 23 | </div> |
| 24 | {{/isEqual}} | 24 | {{/isEqual}} |
| 25 | {{#isEqual page pageTotal}} | 25 | {{#isEqual page pageTotal}} |
| @@ -32,8 +32,8 @@ exports.createPagination = function(pagination, options) { | @@ -32,8 +32,8 @@ exports.createPagination = function(pagination, options) { | ||
| 32 | n, // page number ?page=n | 32 | n, // page number ?page=n |
| 33 | queryParams = '', // paginate with query parameter | 33 | queryParams = '', // paginate with query parameter |
| 34 | page = parseInt(pagination.page, 10), // current page number | 34 | page = parseInt(pagination.page, 10), // current page number |
| 35 | - leftText = '<i class="iconfont"></i>', // prev | ||
| 36 | - rightText = '<i class="iconfont"></i>', // next | 35 | + leftText = '<i class="iconfont"></i>', // prev |
| 36 | + rightText = '<i class="iconfont"></i>', // next | ||
| 37 | paginationClass = 'blk-pagination'; // pagination <ul> default class | 37 | paginationClass = 'blk-pagination'; // pagination <ul> default class |
| 38 | 38 | ||
| 39 | var pageCount, | 39 | var pageCount, |
| @@ -30,14 +30,28 @@ | @@ -30,14 +30,28 @@ | ||
| 30 | 30 | ||
| 31 | .editorial-title { | 31 | .editorial-title { |
| 32 | width: 100%; | 32 | width: 100%; |
| 33 | - min-height: 70px; | ||
| 34 | - line-height: 1.4; | ||
| 35 | - padding: $space; | 33 | + height: 70px; |
| 36 | position: absolute; | 34 | position: absolute; |
| 37 | bottom: 0; | 35 | bottom: 0; |
| 38 | background-color: rgba(0, 0, 0, 0.5); | 36 | background-color: rgba(0, 0, 0, 0.5); |
| 39 | color: #fff; | 37 | color: #fff; |
| 40 | font-size: 14px; | 38 | font-size: 14px; |
| 39 | + line-height:70px; | ||
| 40 | + padding: 0 $space; | ||
| 41 | + | ||
| 42 | + div{ | ||
| 43 | + line-height: 1.6; | ||
| 44 | + display: inline-block; | ||
| 45 | + vertical-align: middle; | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | + p{ | ||
| 49 | + display: -webkit-box; | ||
| 50 | + -webkit-box-orient: vertical; | ||
| 51 | + -webkit-line-clamp: 2; | ||
| 52 | + word-break: break-all; | ||
| 53 | + overflow: hidden; | ||
| 54 | + } | ||
| 41 | } | 55 | } |
| 42 | 56 | ||
| 43 | img { | 57 | img { |
| @@ -8,15 +8,18 @@ | @@ -8,15 +8,18 @@ | ||
| 8 | padding-right: 2px; | 8 | padding-right: 2px; |
| 9 | display: inline-block; | 9 | display: inline-block; |
| 10 | position: relative; | 10 | position: relative; |
| 11 | + height:54px; | ||
| 12 | + line-height: 52px; | ||
| 11 | 13 | ||
| 12 | .iconfont { | 14 | .iconfont { |
| 13 | font-size: 18px; | 15 | font-size: 18px; |
| 14 | - position: relative; | ||
| 15 | - top: -2px; | 16 | + /*position: relative; |
| 17 | + top: -2px;*/ | ||
| 18 | + vertical-align: sub; | ||
| 16 | } | 19 | } |
| 17 | 20 | ||
| 18 | a { | 21 | a { |
| 19 | - vertical-align: top; | 22 | + vertical-align: middle; |
| 20 | } | 23 | } |
| 21 | 24 | ||
| 22 | .yoho-group { | 25 | .yoho-group { |
| @@ -366,6 +369,10 @@ | @@ -366,6 +369,10 @@ | ||
| 366 | .clear-input { | 369 | .clear-input { |
| 367 | display: none; | 370 | display: none; |
| 368 | } | 371 | } |
| 372 | + | ||
| 373 | + form{ | ||
| 374 | + border-bottom: 1px solid #fff; | ||
| 375 | + } | ||
| 369 | } | 376 | } |
| 370 | 377 | ||
| 371 | .search-hint { | 378 | .search-hint { |
| @@ -40,10 +40,14 @@ | @@ -40,10 +40,14 @@ | ||
| 40 | 40 | ||
| 41 | i { | 41 | i { |
| 42 | font-size: 12px; | 42 | font-size: 12px; |
| 43 | + position: relative; | ||
| 44 | + top:-1px; | ||
| 43 | } | 45 | } |
| 44 | 46 | ||
| 45 | .pre-page, | 47 | .pre-page, |
| 46 | .next-page { | 48 | .next-page { |
| 47 | - line-height: 24px; | 49 | + line-height: 22px; |
| 50 | + width: 24px; | ||
| 51 | + height:24px; | ||
| 48 | } | 52 | } |
| 49 | } | 53 | } |
| @@ -362,8 +362,10 @@ | @@ -362,8 +362,10 @@ | ||
| 362 | .tag-icon { | 362 | .tag-icon { |
| 363 | float: left; | 363 | float: left; |
| 364 | margin: 0 12px 0 0; | 364 | margin: 0 12px 0 0; |
| 365 | - font-size: 20px; | 365 | + font-size: 18px; |
| 366 | font-style: normal; | 366 | font-style: normal; |
| 367 | + position: relative; | ||
| 368 | + top:6px; | ||
| 367 | } | 369 | } |
| 368 | 370 | ||
| 369 | ul { | 371 | ul { |
| @@ -406,7 +408,12 @@ | @@ -406,7 +408,12 @@ | ||
| 406 | margin-left: 30px; | 408 | margin-left: 30px; |
| 407 | 409 | ||
| 408 | a { | 410 | a { |
| 409 | - color: #afafaf; | 411 | + color: #999; |
| 412 | + font-size: 12px; | ||
| 413 | + } | ||
| 414 | + | ||
| 415 | + span{ | ||
| 416 | + font-size: 14px; | ||
| 410 | } | 417 | } |
| 411 | } | 418 | } |
| 412 | 419 | ||
| @@ -444,6 +451,7 @@ | @@ -444,6 +451,7 @@ | ||
| 444 | line-height: 18px; | 451 | line-height: 18px; |
| 445 | color: #535353; | 452 | color: #535353; |
| 446 | border: 1px solid #e7e7e7; | 453 | border: 1px solid #e7e7e7; |
| 454 | + font-family: BrownStd, "黑体"; | ||
| 447 | } | 455 | } |
| 448 | } | 456 | } |
| 449 | 457 | ||
| @@ -461,7 +469,7 @@ | @@ -461,7 +469,7 @@ | ||
| 461 | } | 469 | } |
| 462 | 470 | ||
| 463 | .publish-btn { | 471 | .publish-btn { |
| 464 | - margin-top: 10px; | 472 | + margin-top: 20px; |
| 465 | float: left; | 473 | float: left; |
| 466 | width: 100px; | 474 | width: 100px; |
| 467 | height: 30px; | 475 | height: 30px; |
| @@ -485,6 +493,7 @@ | @@ -485,6 +493,7 @@ | ||
| 485 | width: 100%; | 493 | width: 100%; |
| 486 | overflow: hidden; | 494 | overflow: hidden; |
| 487 | margin-bottom: 80px; | 495 | margin-bottom: 80px; |
| 496 | + margin-top: 44px; | ||
| 488 | 497 | ||
| 489 | h4 { | 498 | h4 { |
| 490 | font-size: 14px; | 499 | font-size: 14px; |
| @@ -554,7 +563,7 @@ | @@ -554,7 +563,7 @@ | ||
| 554 | .comment-content { | 563 | .comment-content { |
| 555 | margin-top: 10px; | 564 | margin-top: 10px; |
| 556 | line-height: 16px; | 565 | line-height: 16px; |
| 557 | - font-size: 12px; | 566 | + font-size: 14px; |
| 558 | word-wrap: break-word; | 567 | word-wrap: break-word; |
| 559 | } | 568 | } |
| 560 | 569 |
| @@ -23,16 +23,17 @@ | @@ -23,16 +23,17 @@ | ||
| 23 | } | 23 | } |
| 24 | .progress-text { | 24 | .progress-text { |
| 25 | margin-left: 62px; | 25 | margin-left: 62px; |
| 26 | + font-size: 14px; | ||
| 26 | 27 | ||
| 27 | span { | 28 | span { |
| 28 | - padding: 0 50px; | 29 | + padding: 0 55px; |
| 29 | } | 30 | } |
| 30 | .gray-text { | 31 | .gray-text { |
| 31 | color: #d3d3d3; | 32 | color: #d3d3d3; |
| 32 | - padding: 0 38px; | 33 | + padding: 0 42px; |
| 33 | } | 34 | } |
| 34 | .pad66{ | 35 | .pad66{ |
| 35 | - padding-left: 66px; | 36 | + padding-left: 71px; |
| 36 | } | 37 | } |
| 37 | } | 38 | } |
| 38 | .operate1, | 39 | .operate1, |
| @@ -86,7 +87,7 @@ | @@ -86,7 +87,7 @@ | ||
| 86 | height: 26px; | 87 | height: 26px; |
| 87 | } | 88 | } |
| 88 | .submit { | 89 | .submit { |
| 89 | - margin-left: 150px; | 90 | + margin-left: 175px; |
| 90 | } | 91 | } |
| 91 | } | 92 | } |
| 92 | } | 93 | } |
| @@ -102,6 +102,7 @@ | @@ -102,6 +102,7 @@ | ||
| 102 | > p { | 102 | > p { |
| 103 | line-height: 50px; | 103 | line-height: 50px; |
| 104 | text-align: left; | 104 | text-align: left; |
| 105 | + font-size: 14px; | ||
| 105 | } | 106 | } |
| 106 | 107 | ||
| 107 | .title { | 108 | .title { |
| @@ -138,6 +139,8 @@ | @@ -138,6 +139,8 @@ | ||
| 138 | border: 1px solid #f0f0f0; | 139 | border: 1px solid #f0f0f0; |
| 139 | font-weight: bold; | 140 | font-weight: bold; |
| 140 | cursor: pointer; | 141 | cursor: pointer; |
| 142 | + font-size: 14px; | ||
| 143 | + | ||
| 141 | &:last-child{ | 144 | &:last-child{ |
| 142 | margin-right: 0; | 145 | margin-right: 0; |
| 143 | } | 146 | } |
| @@ -448,7 +451,7 @@ | @@ -448,7 +451,7 @@ | ||
| 448 | } | 451 | } |
| 449 | 452 | ||
| 450 | img { | 453 | img { |
| 451 | - margin-top: -5px; | 454 | + margin-top: -6px; |
| 452 | display: inline-block; | 455 | display: inline-block; |
| 453 | border: 1px solid #fff; | 456 | border: 1px solid #fff; |
| 454 | border-radius: 50%; | 457 | border-radius: 50%; |
| @@ -189,12 +189,13 @@ $hoverColor: #379ed6; | @@ -189,12 +189,13 @@ $hoverColor: #379ed6; | ||
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | .size-item { | 191 | .size-item { |
| 192 | - height: 20px; | 192 | + height: 34px; |
| 193 | border: 1px solid #e8e8e8; | 193 | border: 1px solid #e8e8e8; |
| 194 | display: inline-block; | 194 | display: inline-block; |
| 195 | text-align: center; | 195 | text-align: center; |
| 196 | font-size: 12px; | 196 | font-size: 12px; |
| 197 | - padding: 4px; | 197 | + padding: 0 12px; |
| 198 | + line-height: 34px; | ||
| 198 | 199 | ||
| 199 | &.disabled { | 200 | &.disabled { |
| 200 | color: #f0f0f0; | 201 | color: #f0f0f0; |
| @@ -2,13 +2,15 @@ | @@ -2,13 +2,15 @@ | ||
| 2 | .edit-color-size { | 2 | .edit-color-size { |
| 3 | position: absolute; | 3 | position: absolute; |
| 4 | left: 190px; | 4 | left: 190px; |
| 5 | - width: 354px; | 5 | + width: 356px; |
| 6 | border: 2px solid #bbb; | 6 | border: 2px solid #bbb; |
| 7 | top: -113px; | 7 | top: -113px; |
| 8 | *top: -113px; | 8 | *top: -113px; |
| 9 | background: #fff; | 9 | background: #fff; |
| 10 | z-index: 1000; | 10 | z-index: 1000; |
| 11 | - padding: 25px 20px; | 11 | + padding: 20px 19px; |
| 12 | + font-size: 14px; | ||
| 13 | + | ||
| 12 | 14 | ||
| 13 | .indicator { | 15 | .indicator { |
| 14 | position: absolute; | 16 | position: absolute; |
| @@ -37,8 +39,10 @@ | @@ -37,8 +39,10 @@ | ||
| 37 | } | 39 | } |
| 38 | 40 | ||
| 39 | .active { | 41 | .active { |
| 40 | - background-color: #444; | ||
| 41 | - color: #fff; | 42 | + /*background-color: #444; |
| 43 | + color: #fff;*/ | ||
| 44 | + border: 2px solid #1d1d1d !important; | ||
| 45 | + box-sizing: border-box; | ||
| 42 | } | 46 | } |
| 43 | 47 | ||
| 44 | .current-color { | 48 | .current-color { |
| @@ -54,8 +58,14 @@ | @@ -54,8 +58,14 @@ | ||
| 54 | float: left; | 58 | float: left; |
| 55 | 59 | ||
| 56 | .img-preview { | 60 | .img-preview { |
| 57 | - margin: 20px 0; | 61 | + margin: 0; |
| 62 | + width: 118px; | ||
| 63 | + height:160px; | ||
| 58 | } | 64 | } |
| 59 | } | 65 | } |
| 66 | + | ||
| 67 | + .firstletter{ | ||
| 68 | + color: #c1c1c1; | ||
| 69 | + } | ||
| 60 | } | 70 | } |
| 61 | } | 71 | } |
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | <div class="content"> | 3 | <div class="content"> |
| 4 | <div class="left"> | 4 | <div class="left"> |
| 5 | <div class="default-color mb20"> | 5 | <div class="default-color mb20"> |
| 6 | - <span class="color-label mr10">Color: </span><span class="selected-color">{{defaultColor}}</span> | 6 | + <span class="color-label mr10 firstletter">Color: </span><span class="selected-color">{{defaultColor}}</span> |
| 7 | </div> | 7 | </div> |
| 8 | 8 | ||
| 9 | <div class="colors-list mb20"> | 9 | <div class="colors-list mb20"> |
| @@ -21,13 +21,13 @@ | @@ -21,13 +21,13 @@ | ||
| 21 | {{#each colors}} | 21 | {{#each colors}} |
| 22 | <div class="sizes-list {{#if active}}current-sizes{{/if}}" id="{{proId}}-color-{{@index}}" style="display: {{#if active}}block{{^}}none{{/if}};"> | 22 | <div class="sizes-list {{#if active}}current-sizes{{/if}}" id="{{proId}}-color-{{@index}}" style="display: {{#if active}}block{{^}}none{{/if}};"> |
| 23 | <div class="default-size mb20"> | 23 | <div class="default-size mb20"> |
| 24 | - <span class="size-label mr10">Size: </span><span>{{../defaultSize}}</span> | 24 | + <span class="size-label mr10 firstletter">Size: </span><span>{{../defaultSize}}</span> |
| 25 | </div> | 25 | </div> |
| 26 | 26 | ||
| 27 | <div class="sizes-list mb10"> | 27 | <div class="sizes-list mb10"> |
| 28 | {{#each sizes}} | 28 | {{#each sizes}} |
| 29 | <span class="size-item mr10 mb10{{#if sizeFocus}} current active{{/if}}{{#isEqual num 0}} disabled{{/isEqual}}" | 29 | <span class="size-item mr10 mb10{{#if sizeFocus}} current active{{/if}}{{#isEqual num 0}} disabled{{/isEqual}}" |
| 30 | - data-sku="{{sku}}">{{name}}</span> | 30 | + data-sku="{{sku}}">{{name}}</span> |
| 31 | {{/each}} | 31 | {{/each}} |
| 32 | </div> | 32 | </div> |
| 33 | </div> | 33 | </div> |
| @@ -42,4 +42,4 @@ | @@ -42,4 +42,4 @@ | ||
| 42 | <img src="{{image defaultImg 100 134}}" class="img-preview" title="{{defaultColor}}"/> | 42 | <img src="{{image defaultImg 100 134}}" class="img-preview" title="{{defaultColor}}"/> |
| 43 | </div> | 43 | </div> |
| 44 | </div> | 44 | </div> |
| 45 | -</div> | ||
| 45 | +</div> |
-
Please register or login to post a comment