Merge branch 'feature/wap323' of git.dev.yoho.cn:web/yohobuy into feature/wap323
Showing
4 changed files
with
41 additions
and
6 deletions
1 | @import "header-download", "banner-top","banner-center","banner-bottom", "side-nav", "floor-header", "hot-brands", "fine-brands", "creative-life", "plus-star", "maybe-like", | 1 | @import "header-download", "banner-top","banner-center","banner-bottom", "side-nav", "floor-header", "hot-brands", "fine-brands", "creative-life", "plus-star", "maybe-like", |
2 | "icons-enter","trendsetter-collocation", | 2 | "icons-enter","trendsetter-collocation", |
3 | -"trend-topics","goods-category","hot-brands", "hot-category", "home-header"; | ||
4 | - | 3 | +"trend-topics","goods-category","hot-brands", "hot-category", "home-header", "thumb-row"; |
4 | + | ||
5 | .mobile-container{ | 5 | .mobile-container{ |
6 | width: 100%; | 6 | width: 100%; |
7 | overflow: hidden; | 7 | overflow: hidden; |
@@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
21 | .overlay { | 21 | .overlay { |
22 | display: none; | 22 | display: none; |
23 | position: absolute; | 23 | position: absolute; |
24 | - top: 0; | 24 | + top: 0; |
25 | left: 0; | 25 | left: 0; |
26 | right: 0; | 26 | right: 0; |
27 | bottom: 0; | 27 | bottom: 0; |
static/sass/home/_thumb-row.scss
0 → 100644
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); | ||
10 | + background-color: #f0f0f0; | ||
11 | + text-align: center; | ||
12 | + padding: 32rem/$pxConvertRem 14rem/$pxConvertRem 0; | ||
13 | + | ||
14 | + .thumb-row-box { | ||
15 | + display: inline-block; | ||
16 | + width: 275rem/$pxConvertRem; | ||
17 | + height: 160rem/$pxConvertRem; | ||
18 | + border-radius: 4px; | ||
19 | + background-size: 100%; | ||
20 | + background-repeat: no-repeat; | ||
21 | + background-position: center; | ||
22 | + } | ||
23 | +} |
@@ -14,6 +14,11 @@ | @@ -14,6 +14,11 @@ | ||
14 | {{> home/banner}} | 14 | {{> home/banner}} |
15 | {{/ banner}} | 15 | {{/ banner}} |
16 | 16 | ||
17 | + {{! 两个小图}} | ||
18 | + {{# smallPic}} | ||
19 | + {{> home/thumb_row}} | ||
20 | + {{/ smallPic}} | ||
21 | + | ||
17 | {{! 热门品类}} | 22 | {{! 热门品类}} |
18 | {{# hotCategory}} | 23 | {{# hotCategory}} |
19 | {{> home/hot_category}} | 24 | {{> home/hot_category}} |
@@ -38,7 +43,7 @@ | @@ -38,7 +43,7 @@ | ||
38 | {{# trendTopics}} | 43 | {{# trendTopics}} |
39 | {{> home/trend_topics}} | 44 | {{> home/trend_topics}} |
40 | {{/ trendTopics}} | 45 | {{/ trendTopics}} |
41 | - | 46 | + |
42 | {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}} | 47 | {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}} |
43 | {{# goodsCategory}} | 48 | {{# goodsCategory}} |
44 | {{> home/goods_category}} | 49 | {{> home/goods_category}} |
@@ -55,5 +60,5 @@ | @@ -55,5 +60,5 @@ | ||
55 | {{/ plusStar}} | 60 | {{/ plusStar}} |
56 | {{/ content}} | 61 | {{/ content}} |
57 | 62 | ||
58 | -{{! 可能喜欢}} | ||
59 | -{{> home/maybe_like}} | ||
63 | +{{! 可能喜欢}} | ||
64 | +{{> home/maybe_like}} |
-
Please register or login to post a comment