Showing
7 changed files
with
44 additions
and
4 deletions
@@ -55,4 +55,12 @@ | @@ -55,4 +55,12 @@ | ||
55 | {{#if newUserFloor}} | 55 | {{#if newUserFloor}} |
56 | {{> resources/fresh-only}} | 56 | {{> resources/fresh-only}} |
57 | {{/if}} | 57 | {{/if}} |
58 | + {{! 标题楼层}} | ||
59 | + {{#if titleFloor}} | ||
60 | + {{> resources/title-floor}} | ||
61 | + {{/if}} | ||
62 | + {{! 标题楼层}} | ||
63 | + {{#if threePicture}} | ||
64 | + {{> resources/three-picture}} | ||
65 | + {{/if}} | ||
58 | {{/content}} | 66 | {{/content}} |
@@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
39 | "express-handlebars": "^3.0.0", | 39 | "express-handlebars": "^3.0.0", |
40 | "express-session": "^1.14.0", | 40 | "express-session": "^1.14.0", |
41 | "influxdb-winston": "^1.0.1", | 41 | "influxdb-winston": "^1.0.1", |
42 | - "lodash": "^4.13.1", | 42 | + "lodash": "^4.15.0", |
43 | "md5": "^2.1.0", | 43 | "md5": "^2.1.0", |
44 | "memcached": "^2.2.1", | 44 | "memcached": "^2.2.1", |
45 | "moment": "^2.14.1", | 45 | "moment": "^2.14.1", |
@@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
55 | "serve-favicon": "^2.3.0", | 55 | "serve-favicon": "^2.3.0", |
56 | "uuid": "^2.0.2", | 56 | "uuid": "^2.0.2", |
57 | "winston": "^2.2.0", | 57 | "winston": "^2.2.0", |
58 | - "winston-daily-rotate-file": "^1.1.4", | 58 | + "winston-daily-rotate-file": "^1.2.0", |
59 | "yoho-node-lib": "0.0.40" | 59 | "yoho-node-lib": "0.0.40" |
60 | }, | 60 | }, |
61 | "devDependencies": { | 61 | "devDependencies": { |
@@ -88,8 +88,8 @@ | @@ -88,8 +88,8 @@ | ||
88 | "precss": "^1.4.0", | 88 | "precss": "^1.4.0", |
89 | "rewire": "^2.5.2", | 89 | "rewire": "^2.5.2", |
90 | "shelljs": "^0.7.0", | 90 | "shelljs": "^0.7.0", |
91 | - "stylelint": "^6.9.0", | ||
92 | - "stylelint-config-yoho": "^1.2.3", | 91 | + "stylelint": "^7.1.0", |
92 | + "stylelint-config-yoho": "^1.2.6", | ||
93 | "webpack": "^1.13.1", | 93 | "webpack": "^1.13.1", |
94 | "webpack-dev-server": "^1.14.1", | 94 | "webpack-dev-server": "^1.14.1", |
95 | "webpack-stream": "^3.1.0", | 95 | "webpack-stream": "^3.1.0", |
@@ -23,6 +23,7 @@ | @@ -23,6 +23,7 @@ | ||
23 | @import "coupon"; | 23 | @import "coupon"; |
24 | @import "discount-list"; | 24 | @import "discount-list"; |
25 | @import "left-right"; | 25 | @import "left-right"; |
26 | +@import "three-picture"; | ||
26 | 27 | ||
27 | .mobile-container { | 28 | .mobile-container { |
28 | margin-left: auto; | 29 | margin-left: auto; |
public/scss/channel/_three-picture.css
0 → 100644
1 | +.three-picture { | ||
2 | + padding: 0 0 24px 24px; | ||
3 | + border-bottom: 1px solid #e0e0e0; | ||
4 | + background: #fff; | ||
5 | + | ||
6 | + a { | ||
7 | + float: left; | ||
8 | + width: 182px; | ||
9 | + height: 238px; | ||
10 | + margin-right: 24px; | ||
11 | + | ||
12 | + &:nth-child(3n) { | ||
13 | + margin-right: 0; | ||
14 | + } | ||
15 | + } | ||
16 | + | ||
17 | + img { | ||
18 | + width: 100%; | ||
19 | + height: 100%; | ||
20 | + } | ||
21 | +} |
-
Please register or login to post a comment