fe / YOHOBUYWAP · Commits

Go to a project

Authored by hf
Commit a60fe3ebf724c42614870fbb8a43c9e3995ea567 2 parents 292fbfda 5de89303

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

Inline Side-by-side
Showing 3 changed files with 8 additions and 7 deletions
1 .good-info { 1 .good-info {
2 - float: left; 2 + display: inline-block;
3 width: 276rem / $pxConvertRem; 3 width: 276rem / $pxConvertRem;
4 height: 486rem / $pxConvertRem; 4 height: 486rem / $pxConvertRem;
5 margin: 28rem / $pxConvertRem (15rem / $pxConvertRem) 0; 5 margin: 28rem / $pxConvertRem (15rem / $pxConvertRem) 0;
@@ -83,20 +83,20 @@ @@ -83,20 +83,20 @@
83 padding-top: 10rem / $pxConvertRem; 83 padding-top: 10rem / $pxConvertRem;
84 height: 76rem / $pxConvertRem; 84 height: 76rem / $pxConvertRem;
85 line-height: 76rem / $pxConvertRem; 85 line-height: 76rem / $pxConvertRem;
86 - font-size: 34rem / $pxConvertRem; 86 + font-size: 28rem / $pxConvertRem;
87 border-bottom: 1px solid #f3f3f3; 87 border-bottom: 1px solid #f3f3f3;
88 border-top: 1px solid #f9f9f9; 88 border-top: 1px solid #f9f9f9;
89 i { 89 i {
90 display: inline-block; 90 display: inline-block;
91 margin-left: 24rem / $pxConvertRem; 91 margin-left: 24rem / $pxConvertRem;
92 - width: 40rem / $pxConvertRem;  
93 - height: 40rem / $pxConvertRem; 92 + width: 58rem / $pxConvertRem;
  93 + height: 38rem / $pxConvertRem;
94 text-align: center; 94 text-align: center;
95 vertical-align: middle; 95 vertical-align: middle;
96 - font-size: 28rem / $pxConvertRem;  
97 - line-height: 40rem / $pxConvertRem; 96 + font-size: 18rem / $pxConvertRem;
  97 + line-height: 39rem / $pxConvertRem;
98 color: #fff; 98 color: #fff;
99 - border-radius: 50%; 99 + border-radius: 50rem / $pxConvertRem;;
100 } 100 }
101 .icon-hot { 101 .icon-hot {
102 background: #ff0000; 102 background: #ff0000;
@@ -83,6 +83,7 @@ @@ -83,6 +83,7 @@
83 .goods-container { 83 .goods-container {
84 position: relative; 84 position: relative;
85 min-height: 440px; 85 min-height: 440px;
  86 + text-align: center;
86 } 87 }
87 88
88 } 89 }