Authored by 毕凯

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

#thumb-row {
@include flexbox((
display: box,
box-pack: justify
), $version: 1);
@include flexbox((
display: flex,
justify-content: space-around
), $version: 3);
// @include flexbox((
// display: box,
// box-pack: justify
// ), $version: 1);
// @include flexbox((
// display: flex,
// justify-content: space-around
// ), $version: 3);
background-color: #f0f0f0;
text-align: center;
padding: 32rem/$pxConvertRem 14rem/$pxConvertRem 0;
padding: 32rem/$pxConvertRem 0 0;
.thumb-row-box {
display: inline-block;
width: 275rem/$pxConvertRem;
... ... @@ -19,5 +18,6 @@
background-size: 100%;
background-repeat: no-repeat;
background-position: center;
margin: 0 14.4rem/$pxConvertRem;
}
}
... ...
... ... @@ -47,7 +47,7 @@
right: 0;
top: 0;
margin-right: pxToRem(30px);
font-size: pxToRem(28px);
font-size: pxToRem(34px);
font-weight: bold;
line-height: pxToRem(100px);
}
... ...
... ... @@ -12,14 +12,12 @@
}
.info {
width: auto;
color: #b0b0b0;
font-size: pxToRem(24px);
line-height: 1;
line-height: 1rem;
.dollar {
display: inline-block;
// margin-right: pxToRem(6px);
vertical-align: middle;
width: pxToRem(24px);
height: pxToRem(24px);
background: image-url("me/yoho-coin/dollar.png") center center;
... ... @@ -29,15 +27,15 @@
.more {
display: inline-block;
margin: pxToRem(30px) 0;
margin: pxToRem(20px) 0 pxToRem(30px);
color: #444;
font-size: pxToRem(24px);
line-height: pxToRem(40px);
width: pxToRem(152px);
height: pxToRem(36px);
font-size: pxToRem(28px);
line-height: pxToRem(44px);
width: pxToRem(168px);
height: pxToRem(42px);
text-align: center;
border: 1px solid #444;
border-radius: pxToRem(36px);
border-radius: pxToRem(22px);
}
.coin-tip {
... ... @@ -45,7 +43,7 @@
padding: pxToRem(20px) pxToRem(30px);
font-size: pxToRem(24px);
line-height: pxToRem(32px);
color: #dc6870;
color: #d0021b;
border-top: 1px solid #e0e0e0;
border-bottom: 1px solid #e0e0e0;
... ... @@ -54,7 +52,7 @@
width: pxToRem(32px);
height: pxToRem(32px);
font-weight: bold;
border: 2px solid #dc6870;
border: 2px solid #d0021b;
border-radius: 50%;
}
}
... ...
... ... @@ -997,6 +997,7 @@ class HomeController extends AbstractAction
$this->_view->display('currency-detail', array(
'money' => $data['money'],
'pageFooter' => true,
'currencyPage' => true,
'currencyDetail' => true,
'currencyDetailPage' => true
));
... ...