Authored by 毕凯

Merge branch 'feature/newHome' into 'release/6.1'

资源位样式调整



See merge request !923
@@ -5,10 +5,6 @@ @@ -5,10 +5,6 @@
5 {{> resources/banner}} 5 {{> resources/banner}}
6 </div> 6 </div>
7 {{/if}} 7 {{/if}}
8 - {{! 两个小图}}  
9 - {{#if smallPic}}  
10 - {{> resources/thumb-row}}  
11 - {{/if}}  
12 {{! 分隔楼层}} 8 {{! 分隔楼层}}
13 {{#if divideImage}} 9 {{#if divideImage}}
14 {{> resources/divide-image}} 10 {{> resources/divide-image}}
1 @import "common/set-trend-world"; 1 @import "common/set-trend-world";
2 -@import "channel/thumb-row";  
3 @import "channel/divide-image"; 2 @import "channel/divide-image";
4 @import "channel/banner-center"; 3 @import "channel/banner-center";
5 @import "layout/swiper"; 4 @import "layout/swiper";
@@ -28,7 +27,7 @@ @@ -28,7 +27,7 @@
28 height: 70px; 27 height: 70px;
29 line-height: 70px; 28 line-height: 70px;
30 text-align: center; 29 text-align: center;
31 - border: solid 2px #fff; 30 + border: solid 3px #fff;
32 color: #fff; 31 color: #fff;
33 font-size: 28px; 32 font-size: 28px;
34 margin: 15px auto; 33 margin: 15px auto;