fe / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit 9c81d24c3ce26578e6159e571e4db1befc0b93bf 2 parents 31a710e6 fa703674

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 5 changed files with 72 additions and 26 deletions
1 require 'compass/import-once/activate' 1 require 'compass/import-once/activate'
  2 +
  3 +# autoprefixer自动加浏览器前缀
  4 +# 需要先安装, gem install autoprefixer-rails
  5 +
  6 +# require 'autoprefixer-rails'
  7 +#
  8 +# on_stylesheet_saved do |file|
  9 +# css = File.read(file)
  10 +# map = file + '.map'
  11 +# browsers = ['> 1%', 'ie 8']
  12 +#
  13 +# if File.exists? map
  14 +# result = AutoprefixerRails.process(css,
  15 +# from: file,
  16 +# to: file,
  17 +# browsers: browsers,
  18 +# map: { prev: File.read(map), inline: false })
  19 +# File.open(file, 'w') { |io| io << result.css }
  20 +# File.open(map, 'w') { |io| io << result.map }
  21 +# else
  22 +# File.open(file, 'w') { |io| io << AutoprefixerRails.process(css, browsers) }
  23 +# end
  24 +# end
  25 +
2 # Require any additional compass plugins here. 26 # Require any additional compass plugins here.
3 27
4 # Set this to the root of your project when deployed: 28 # Set this to the root of your project when deployed:
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
35 35
36 .sum-cost { 36 .sum-cost {
37 color: #e01; 37 color: #e01;
  38 + margin-left: 5px;
38 } 39 }
39 40
40 .order-opt { 41 .order-opt {
@@ -31,6 +31,15 @@ $basicBtnC:#eb0313; @@ -31,6 +31,15 @@ $basicBtnC:#eb0313;
31 margin-bottom: pxToRem(20px); 31 margin-bottom: pxToRem(20px);
32 font-size: pxToRem(24px); 32 font-size: pxToRem(24px);
33 line-height: pxToRem(36px); 33 line-height: pxToRem(36px);
  34 +
  35 + b {
  36 + font-weight: bold;
  37 + }
  38 +
  39 + i {
  40 + font-style: italic;
  41 + }
  42 +
34 &.table { 43 &.table {
35 @include flexbox(( 44 @include flexbox((
36 display: box, 45 display: box,
@@ -208,18 +217,19 @@ $basicBtnC:#eb0313; @@ -208,18 +217,19 @@ $basicBtnC:#eb0313;
208 height: auto; 217 height: auto;
209 li { 218 li {
210 float: left; 219 float: left;
  220 + img {
  221 + height: auto;
  222 + }
211 } 223 }
212 } 224 }
213 } 225 }
214 .goodsName { 226 .goodsName {
215 box-sizing: border-box; 227 box-sizing: border-box;
216 width: 100%; 228 width: 100%;
217 - min-height: pxToRem(88px);  
218 font-size: pxToRem(28px); 229 font-size: pxToRem(28px);
219 color: #fff; 230 color: #fff;
220 - padding-left: pxToRem(28px);  
221 - padding-right: pxToRem(28px);  
222 - line-height: pxToRem(36px); 231 + padding: pxToRem(20px) pxToRem(28px);
  232 + line-height: pxToRem(48px);
223 background-color: #515150; 233 background-color: #515150;
224 } 234 }
225 .goodsSubtitle { 235 .goodsSubtitle {
@@ -278,14 +288,14 @@ $basicBtnC:#eb0313; @@ -278,14 +288,14 @@ $basicBtnC:#eb0313;
278 line-height: pxToRem(88px); 288 line-height: pxToRem(88px);
279 } 289 }
280 } 290 }
281 - .goodsName {  
282 - // width: 100%;  
283 - display: table;  
284 - span {  
285 - display: table-cell;  
286 - vertical-align: middle;  
287 - }  
288 - } 291 + // .goodsName {
  292 + // // width: 100%;
  293 + // display: table;
  294 + // span {
  295 + // display: table-cell;
  296 + // vertical-align: middle;
  297 + // }
  298 + // }
289 .vip-level { 299 .vip-level {
290 box-sizing: box-border; 300 box-sizing: box-border;
291 padding-left: pxToRem(28px); 301 padding-left: pxToRem(28px);
@@ -360,21 +370,28 @@ $basicBtnC:#eb0313; @@ -360,21 +370,28 @@ $basicBtnC:#eb0313;
360 } 370 }
361 } 371 }
362 .enter-store { 372 .enter-store {
363 - min-height: pxToRem(100px);  
364 - display: table; 373 + position: relative;
  374 + padding: 0 pxToRem(180px) 0 pxToRem(114px);
  375 + line-height: pxToRem(84px);
365 background-color: #fff; 376 background-color: #fff;
366 - a {  
367 - display: table-cell;  
368 - vertical-align: middle;  
369 - text-align: left;  
370 - } 377 + white-space: nowrap;
  378 + overflow: hidden;
  379 + text-overflow: ellipsis;
  380 +
371 .store-logo { 381 .store-logo {
372 - // padding-right: 35rem/$pxConvertRem; 382 + position: absolute;
  383 + left: 0;
  384 + top: 1px;
  385 + width: pxToRem(68px);
  386 + height: pxToRem(84px);
  387 + margin-left: pxToRem(30px);
  388 + font-size: 0;
  389 + text-align: center;
373 img { 390 img {
  391 + display: inline-block;
374 width: auto; 392 width: auto;
375 height: pxToRem(68px); 393 height: pxToRem(68px);
376 - margin-left: 0;  
377 - margin-right: pxToRem(-25px); 394 + vertical-align: middle;
378 } 395 }
379 } 396 }
380 .store-name { 397 .store-name {
@@ -382,6 +399,10 @@ $basicBtnC:#eb0313; @@ -382,6 +399,10 @@ $basicBtnC:#eb0313;
382 color: $mainFontC; 399 color: $mainFontC;
383 } 400 }
384 .store-link { 401 .store-link {
  402 + position: absolute;
  403 + right: 0;
  404 + top: 1px;
  405 + padding-right: pxToRem(30px);
385 font-size: pxToRem(28px); 406 font-size: pxToRem(28px);
386 color: $subFontC; 407 color: $subFontC;
387 text-align: right; 408 text-align: right;
@@ -424,7 +445,7 @@ $basicBtnC:#eb0313; @@ -424,7 +445,7 @@ $basicBtnC:#eb0313;
424 margin: 0 pxToRem(100px) 0 pxToRem(115px); 445 margin: 0 pxToRem(100px) 0 pxToRem(115px);
425 color: #fff; 446 color: #fff;
426 background-color: $basicBtnC; 447 background-color: $basicBtnC;
427 - font-size: pxToRem(40px); 448 + font-size: pxToRem(32px);
428 line-height: pxToRem(80px); 449 line-height: pxToRem(80px);
429 text-align: center; 450 text-align: center;
430 } 451 }
@@ -38,8 +38,8 @@ @@ -38,8 +38,8 @@
38 <div class="price-date"> 38 <div class="price-date">
39 {{# goodsPrice}} 39 {{# goodsPrice}}
40 <div class="goodsPrice"> 40 <div class="goodsPrice">
41 - <h1 class="currentPrice">{{currentPrice}}</h1>  
42 - <h1 class="previousPrice">{{previousPrice}}</h1> 41 + <h1 class="currentPrice">¥{{currentPrice}}</h1>
  42 + <h1 class="previousPrice">¥{{previousPrice}}</h1>
43 </div> 43 </div>
44 {{/ goodsPrice}} 44 {{/ goodsPrice}}
45 45
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 <li class="icons-item {{#if currentLevel}}current-level{{/if}}"> 57 <li class="icons-item {{#if currentLevel}}current-level{{/if}}">
58 <span class="vip-img " style="background-size:contain;"> 58 <span class="vip-img " style="background-size:contain;">
59 </span> 59 </span>
60 - <span class="vip-price ">{{text}}</span> 60 + <span class="vip-price ">¥{{text}}</span>
61 </li> 61 </li>
62 {{/ list}} 62 {{/ list}}
63 </ul> 63 </ul>