Authored by hf

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

@@ -155,10 +155,10 @@ @@ -155,10 +155,10 @@
155 display: inline-block; 155 display: inline-block;
156 color: #fff; 156 color: #fff;
157 background: #d1021c; 157 background: #d1021c;
158 - border: 1px solid #9d0000;  
159 - @include border-radius(0.5rem);  
160 - padding: 4rem / $pxConvertRem 0.5rem;  
161 - margin-left: 0.2rem; 158 + @include border-radius(16rem / $pxConvertRem);
  159 + padding: 0rem / $pxConvertRem 12rem / $pxConvertRem;
  160 + margin-left: 8rem / $pxConvertRem;
  161 + font-size: 20rem / $pxConvertRem;
162 } 162 }
163 163
164 .la-tag { 164 .la-tag {
@@ -31,7 +31,7 @@ html, body { @@ -31,7 +31,7 @@ html, body {
31 } 31 }
32 32
33 button, input, select, textarea { 33 button, input, select, textarea {
34 - font-family: inherit; 34 + // font-family: inherit;
35 font-size: 100%; 35 font-size: 100%;
36 margin: 0; 36 margin: 0;
37 } 37 }