Authored by 姜枫

Merge branch 'feature/font-size'

@@ -46,29 +46,29 @@ @@ -46,29 +46,29 @@
46 } 46 }
47 47
48 .banner-list { 48 .banner-list {
49 - height: 200px; 49 + height: 100PX;
50 } 50 }
51 51
52 .banner-center-swiper { 52 .banner-center-swiper {
53 background: #fff; 53 background: #fff;
54 width: 100%; 54 width: 100%;
55 - height: 200px; 55 + height: 100PX;
56 overflow: hidden; 56 overflow: hidden;
57 57
58 .banner-list { 58 .banner-list {
59 - height: 200px; 59 + height: 100PX;
60 60
61 li { 61 li {
62 float: left; 62 float: left;
63 width: 100%; 63 width: 100%;
64 - height: 200px; 64 + height: 100PX;
65 65
66 a { 66 a {
67 position: relative; 67 position: relative;
68 display: block; 68 display: block;
69 width: 100%; 69 width: 100%;
70 height: 100%; 70 height: 100%;
71 - line-height: 200px; 71 + line-height: 100PX;
72 font-size: 0; 72 font-size: 0;
73 } 73 }
74 74
1 .divide-image { 1 .divide-image {
2 - height: 26px; 2 + height: 14PX;
3 width: 100%; 3 width: 100%;
4 background-size: 100% 100%; 4 background-size: 100% 100%;
5 -}  
  5 +}
@@ -19,6 +19,11 @@ @@ -19,6 +19,11 @@
19 font-size: 32px; 19 font-size: 32px;
20 color: #444; 20 color: #444;
21 21
  22 + h2 {
  23 + font-size: 15PX;
  24 + color: #000;
  25 + }
  26 +
22 .more-btn { 27 .more-btn {
23 position: absolute; 28 position: absolute;
24 right: 30px; 29 right: 30px;
1 .icons-wrapper { 1 .icons-wrapper {
2 box-sizing: border-box; 2 box-sizing: border-box;
3 - padding: 30px 0 16px; 3 + padding: 15PX 0 2PX;
4 background: #fff; 4 background: #fff;
5 background-size: 100% 100%; 5 background-size: 100% 100%;
6 border-bottom: 1px solid #e0e0e0; 6 border-bottom: 1px solid #e0e0e0;
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 39
40 .linkbar { 40 .linkbar {
41 display: block; 41 display: block;
42 - line-height: 44px; 42 + line-height: 22PX;
43 font-size: 12PX; 43 font-size: 12PX;
44 color: #444; 44 color: #444;
45 transform: scale(0.9); 45 transform: scale(0.9);
@@ -145,6 +145,7 @@ @@ -145,6 +145,7 @@
145 145
146 .good-detail-text { 146 .good-detail-text {
147 .name a { 147 .name a {
  148 + transform: scale(0.9);
148 margin: 15px 0 10px; 149 margin: 15px 0 10px;
149 min-height: 50px; 150 min-height: 50px;
150 color: #444; 151 color: #444;
@@ -162,6 +163,7 @@ @@ -162,6 +163,7 @@
162 font-size: 12PX; 163 font-size: 12PX;
163 line-height: 22px; 164 line-height: 22px;
164 white-space: nowrap; 165 white-space: nowrap;
  166 + transform: scale(0.9);
165 167
166 .sale-price { 168 .sale-price {
167 color: #d62927; 169 color: #d62927;
@@ -95,12 +95,13 @@ @@ -95,12 +95,13 @@
95 } 95 }
96 96
97 .copyright { 97 .copyright {
98 - height: 120px; 98 + height: 60PX;
99 border-top: 1px solid #ccc; 99 border-top: 1px solid #ccc;
100 background-color: #eee; 100 background-color: #eee;
101 color: #666; 101 color: #666;
102 text-align: center; 102 text-align: center;
103 - line-height: 120px; 103 + line-height: 60PX;
  104 + font-size: 12PX;
104 } 105 }
105 106
106 &.bottom { 107 &.bottom {