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

xuqi
Commit e6d23944346d1f3c857fd16155eb6e4f54aea55b 2 parents 6e3373c4 a556e58a
Showing 2 changed files with 4 additions and 2 deletions
static/sass/cart/_order-ensure.scss
static/sass/product/_recommend-for-you.scss
--- a/static/sass/cart/_order-ensure.scss
View file @e6d2394
+++ b/static/sass/cart/_order-ensure.scss
View file @e6d2394
@@ -125,7 +125,7 @@
             padding-right: 30rem / $pxConvertRem;
             color: #999;
             text-align: right;
-             width: 360rem / $pxConvertRem;
+             width: 320rem / $pxConvertRem;
             white-space: nowrap;
             text-overflow: ellipsis;
             overflow: hidden;
--- a/static/sass/product/_recommend-for-you.scss
View file @e6d2394
+++ b/static/sass/product/_recommend-for-you.scss
View file @e6d2394
 .recommend-for-you {
-     padding: pxToRem(30px) 0 pxToRem(10px);
+     padding: pxToRem(30px) 0 pxToRem(30px);
     border-top: 1px solid #e0e0e0;
     border-bottom: 1px solid #e0e0e0;
     background: #fff;
@@ -45,11 +45,13 @@
         line-height: 1;
 
         .sale-price {
+             display: block;
             color: #d9134f;
             margin-right: pxToRem(8px);
         }
 
         .old-price {
+             display: block;
             color: #b0b0b0;
             text-decoration: line-through;
         }