Showing
4 changed files
with
22 additions
and
23 deletions
1 | #thumb-row { | 1 | #thumb-row { |
2 | - @include flexbox(( | ||
3 | - display: box, | ||
4 | - box-pack: justify | ||
5 | - ), $version: 1); | ||
6 | - @include flexbox(( | ||
7 | - display: flex, | ||
8 | - justify-content: space-around | ||
9 | - ), $version: 3); | 2 | + // @include flexbox(( |
3 | + // display: box, | ||
4 | + // box-pack: justify | ||
5 | + // ), $version: 1); | ||
6 | + // @include flexbox(( | ||
7 | + // display: flex, | ||
8 | + // justify-content: space-around | ||
9 | + // ), $version: 3); | ||
10 | background-color: #f0f0f0; | 10 | background-color: #f0f0f0; |
11 | text-align: center; | 11 | text-align: center; |
12 | - padding: 32rem/$pxConvertRem 14rem/$pxConvertRem 0; | ||
13 | - | 12 | + padding: 32rem/$pxConvertRem 0 0; |
14 | .thumb-row-box { | 13 | .thumb-row-box { |
15 | display: inline-block; | 14 | display: inline-block; |
16 | width: 275rem/$pxConvertRem; | 15 | width: 275rem/$pxConvertRem; |
@@ -19,5 +18,6 @@ | @@ -19,5 +18,6 @@ | ||
19 | background-size: 100%; | 18 | background-size: 100%; |
20 | background-repeat: no-repeat; | 19 | background-repeat: no-repeat; |
21 | background-position: center; | 20 | background-position: center; |
21 | + margin: 0 14.4rem/$pxConvertRem; | ||
22 | } | 22 | } |
23 | } | 23 | } |
@@ -47,7 +47,7 @@ | @@ -47,7 +47,7 @@ | ||
47 | right: 0; | 47 | right: 0; |
48 | top: 0; | 48 | top: 0; |
49 | margin-right: pxToRem(30px); | 49 | margin-right: pxToRem(30px); |
50 | - font-size: pxToRem(28px); | 50 | + font-size: pxToRem(34px); |
51 | font-weight: bold; | 51 | font-weight: bold; |
52 | line-height: pxToRem(100px); | 52 | line-height: pxToRem(100px); |
53 | } | 53 | } |
@@ -12,14 +12,12 @@ | @@ -12,14 +12,12 @@ | ||
12 | } | 12 | } |
13 | 13 | ||
14 | .info { | 14 | .info { |
15 | + width: auto; | ||
15 | color: #b0b0b0; | 16 | color: #b0b0b0; |
16 | font-size: pxToRem(24px); | 17 | font-size: pxToRem(24px); |
17 | - line-height: 1; | ||
18 | - | 18 | + line-height: 1rem; |
19 | .dollar { | 19 | .dollar { |
20 | display: inline-block; | 20 | display: inline-block; |
21 | - // margin-right: pxToRem(6px); | ||
22 | - vertical-align: middle; | ||
23 | width: pxToRem(24px); | 21 | width: pxToRem(24px); |
24 | height: pxToRem(24px); | 22 | height: pxToRem(24px); |
25 | background: image-url("me/yoho-coin/dollar.png") center center; | 23 | background: image-url("me/yoho-coin/dollar.png") center center; |
@@ -29,15 +27,15 @@ | @@ -29,15 +27,15 @@ | ||
29 | 27 | ||
30 | .more { | 28 | .more { |
31 | display: inline-block; | 29 | display: inline-block; |
32 | - margin: pxToRem(30px) 0; | 30 | + margin: pxToRem(20px) 0 pxToRem(30px); |
33 | color: #444; | 31 | color: #444; |
34 | - font-size: pxToRem(24px); | ||
35 | - line-height: pxToRem(40px); | ||
36 | - width: pxToRem(152px); | ||
37 | - height: pxToRem(36px); | 32 | + font-size: pxToRem(28px); |
33 | + line-height: pxToRem(44px); | ||
34 | + width: pxToRem(168px); | ||
35 | + height: pxToRem(42px); | ||
38 | text-align: center; | 36 | text-align: center; |
39 | border: 1px solid #444; | 37 | border: 1px solid #444; |
40 | - border-radius: pxToRem(36px); | 38 | + border-radius: pxToRem(22px); |
41 | } | 39 | } |
42 | 40 | ||
43 | .coin-tip { | 41 | .coin-tip { |
@@ -45,7 +43,7 @@ | @@ -45,7 +43,7 @@ | ||
45 | padding: pxToRem(20px) pxToRem(30px); | 43 | padding: pxToRem(20px) pxToRem(30px); |
46 | font-size: pxToRem(24px); | 44 | font-size: pxToRem(24px); |
47 | line-height: pxToRem(32px); | 45 | line-height: pxToRem(32px); |
48 | - color: #dc6870; | 46 | + color: #d0021b; |
49 | border-top: 1px solid #e0e0e0; | 47 | border-top: 1px solid #e0e0e0; |
50 | border-bottom: 1px solid #e0e0e0; | 48 | border-bottom: 1px solid #e0e0e0; |
51 | 49 | ||
@@ -54,7 +52,7 @@ | @@ -54,7 +52,7 @@ | ||
54 | width: pxToRem(32px); | 52 | width: pxToRem(32px); |
55 | height: pxToRem(32px); | 53 | height: pxToRem(32px); |
56 | font-weight: bold; | 54 | font-weight: bold; |
57 | - border: 2px solid #dc6870; | 55 | + border: 2px solid #d0021b; |
58 | border-radius: 50%; | 56 | border-radius: 50%; |
59 | } | 57 | } |
60 | } | 58 | } |
@@ -997,6 +997,7 @@ class HomeController extends AbstractAction | @@ -997,6 +997,7 @@ class HomeController extends AbstractAction | ||
997 | $this->_view->display('currency-detail', array( | 997 | $this->_view->display('currency-detail', array( |
998 | 'money' => $data['money'], | 998 | 'money' => $data['money'], |
999 | 'pageFooter' => true, | 999 | 'pageFooter' => true, |
1000 | + 'currencyPage' => true, | ||
1000 | 'currencyDetail' => true, | 1001 | 'currencyDetail' => true, |
1001 | 'currencyDetailPage' => true | 1002 | 'currencyDetailPage' => true |
1002 | )); | 1003 | )); |
-
Please register or login to post a comment