fe / yoho-blk · Commits

Go to a project

Authored by biao
Commit ca295b0916f9fe55e7dbdfebaeb5bd8f6ac301b3 2 parents 83e29422 c7af8ea9

Merge branch 'feature/channel' into develop

Inline Side-by-side
Showing 13 changed files with 285 additions and 264 deletions
  1 +const model = require('../models');
  2 +
  3 +exports.index = (req, res) => {
  4 + res.render('index', Object.assign({
  5 + module: 'channel',
  6 + page: 'home'
  7 + }, model.getContent()));
  8 +};
1 const getContent = () => { 1 const getContent = () => {
2 const content = { 2 const content = {
  3 + /* eslint-disable */
3 content: [ 4 content: [
4 - {  
5 - slider: [  
6 - {  
7 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',  
8 - link: '/'  
9 - },  
10 - {  
11 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',  
12 - link: '/'  
13 - },  
14 - {  
15 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
16 - link: '/'  
17 - },  
18 - {  
19 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',  
20 - link: '/'  
21 - },  
22 - {  
23 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',  
24 - link: '/'  
25 - },  
26 - {  
27 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',  
28 - link: '/'  
29 - }  
30 - ]  
31 - },  
32 - {  
33 - brandsAd: [  
34 - {  
35 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
36 - name: 'GINZA',  
37 - des: '藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场',  
38 - btnText: 'shop now'  
39 - },  
40 - { 5 + {
  6 + slider: [
  7 + {
  8 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',
  9 + link: '/'
  10 + },
  11 + {
  12 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',
  13 + link: '/'
  14 + },
  15 + {
  16 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  17 + link: '/'
  18 + },
  19 + {
  20 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',
  21 + link: '/'
  22 + },
  23 + {
  24 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',
  25 + link: '/'
  26 + },
  27 + {
  28 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',
  29 + link: '/'
  30 + }
  31 + ]
  32 + },
  33 + {
  34 + brandsAd: [
  35 + {
  36 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  37 + name: 'GINZA',
  38 + des: '藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场',
  39 + btnText: 'shop now'
  40 + },
  41 + {
  42 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  43 + name: 'STUSSY',
  44 + des: '藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场',
  45 + btnText: 'shop now'
  46 + }
  47 + ]
  48 + },
  49 + {
  50 + floorZh: '新品抢鲜看',
  51 + floorEn: 'NEW ARRIVALS',
  52 + newArrivals: [
  53 + {
  54 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  55 + name: 'STUSSY',
  56 + link: '/',
  57 + smallImg: true
  58 + },
  59 + {
  60 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  61 + name: 'DAILY PAPER',
  62 + link: '/',
  63 + even: true
  64 + },
  65 + {
  66 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  67 + name: 'BAPE',
  68 + link: '/'
  69 + },
  70 + {
  71 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  72 + name: 'SUPREME',
  73 + link: '/',
  74 + even: true,
  75 + smallImg: true
  76 + }
  77 + ]
  78 + },
  79 + {
  80 + floorZh: '经典品牌',
  81 + floorEn: 'CLASSIC BRANDS',
  82 + classicBrands: [
  83 + {
  84 + big: [
  85 + {
  86 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  87 + link: ''
  88 + }
  89 + ],
  90 + small: [
  91 + {
  92 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/30/10/01714bacda5e9fa323a1dc5f720a7f7140.jpg?imageView2/1/w/185/h/248',
  93 + link: ''
  94 + },
  95 + {
  96 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/30/10/01714bacda5e9fa323a1dc5f720a7f7140.jpg?imageView2/1/w/185/h/248',
  97 + link: ''
  98 + }
  99 + ],
  100 + bottomSpace: true
  101 + },
  102 + {
  103 + big: [
  104 + {
  105 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  106 + link: ''
  107 + }
  108 + ],
  109 + small: [
  110 + {
  111 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  112 + link: ''
  113 + },
  114 + {
  115 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  116 + link: ''
  117 + }
  118 + ],
  119 + right: true,
  120 + bottomSpace: true
  121 + },
  122 + {
  123 + big: [
  124 + {
  125 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  126 + link: ''
  127 + }
  128 + ],
  129 + small: [
  130 + {
  131 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  132 + link: ''
  133 + },
  134 + {
  135 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  136 + link: ''
  137 + }
  138 + ]
  139 + },
  140 + {
  141 + big: [
  142 + {
  143 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  144 + link: ''
  145 + }
  146 + ],
  147 + small: [
  148 + {
  149 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  150 + link: ''
  151 + },
  152 + {
  153 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  154 + link: ''
  155 + }
  156 + ],
  157 + right: true
  158 + }
  159 + ]
  160 + },
  161 + {
  162 + floorZh: '潮流标志',
  163 + floorEn: 'STYLE ICON',
  164 + styleIcon: [
  165 + {
  166 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  167 + name: 'COTE&CIEL',
  168 + des: '这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生',
  169 + link: '/ ',
  170 + btnText: '去看看'
  171 + },
  172 + {
  173 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  174 + name: 'COTE&CIEL',
  175 + des: '这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生',
  176 + link: '/ ',
  177 + btnText: '去看看'
  178 + },
  179 + {
  180 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  181 + name: 'COTE&CIEL',
  182 + des: '这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生',
  183 + link: '/ ',
  184 + btnText: '去看看'
  185 + },
  186 + {
  187 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  188 + name: 'COTE&CIEL',
  189 + des: '这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生',
  190 + link: '/ ',
  191 + btnText: '去看看'
  192 + }
  193 + ]
  194 + },
  195 + {
  196 + adBanner: {
41 img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450', 197 img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
42 - name: 'STUSSY',  
43 - des: '藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场',  
44 - btnText: 'shop now' 198 + link: ''
45 } 199 }
46 - ]  
47 - },  
48 - {  
49 - floorZh: '新品抢鲜看',  
50 - floorEn: 'NEW ARRIVALS',  
51 - newArrivals: [  
52 - {  
53 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
54 - name: 'STUSSY',  
55 - link: '/',  
56 - smallImg: true  
57 - },  
58 - {  
59 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
60 - name: 'DAILY PAPER',  
61 - link: '/',  
62 - even: true  
63 - },  
64 - {  
65 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
66 - name: 'BAPE',  
67 - link: '/'  
68 - },  
69 - {  
70 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
71 - name: 'SUPREME',  
72 - link: '/',  
73 - even: true,  
74 - smallImg: true  
75 - },  
76 - ]  
77 - },  
78 - {  
79 - floorZh: '经典品牌',  
80 - floorEn: 'CLASSIC BRANDS',  
81 - classicBrands: [  
82 - {  
83 - big: [  
84 - {  
85 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
86 - link: ''  
87 - }  
88 - ],  
89 - small: [  
90 - {  
91 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/30/10/01714bacda5e9fa323a1dc5f720a7f7140.jpg?imageView2/1/w/185/h/248',  
92 - link: ''  
93 - },  
94 - {  
95 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/30/10/01714bacda5e9fa323a1dc5f720a7f7140.jpg?imageView2/1/w/185/h/248',  
96 - link: ''  
97 - }  
98 - ],  
99 - bottomSpace: true  
100 - },  
101 - {  
102 - big: [  
103 - {  
104 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
105 - link: ''  
106 - }  
107 - ], 200 + },
  201 + {
  202 + floorZh: '资讯',
  203 + floorEn: 'EDITORIAL',
  204 + editorial: {
  205 + big: {
  206 + img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
  207 + link: ''
  208 + },
108 small: [ 209 small: [
109 { 210 {
110 img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450', 211 img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
111 - link: '' 212 + link: '/',
  213 + bottomSpace: true,
  214 + rightSpace: true
112 }, 215 },
113 { 216 {
114 img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450', 217 img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
115 - link: ''  
116 - }  
117 - ],  
118 - right: true,  
119 - bottomSpace: true  
120 - },  
121 - {  
122 - big: [  
123 - {  
124 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
125 - link: ''  
126 - }  
127 - ],  
128 - small: [  
129 - {  
130 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
131 - link: '' 218 + link: '/',
  219 + bottomSpace: true
132 }, 220 },
133 { 221 {
134 img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450', 222 img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
135 - link: ''  
136 - }  
137 - ]  
138 - },  
139 - {  
140 - big: [  
141 - {  
142 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
143 - link: ''  
144 - }  
145 - ],  
146 - small: [  
147 - {  
148 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
149 - link: '' 223 + link: '/',
  224 + rightSpace: true
150 }, 225 },
151 { 226 {
152 img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450', 227 img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
153 link: '' 228 link: ''
154 } 229 }
155 - ],  
156 - right: true  
157 - }  
158 - ]  
159 - },  
160 - {  
161 - floorZh: '潮流标志',  
162 - floorEn: 'STYLE ICON',  
163 - styleIcon: [  
164 - {  
165 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
166 - name: 'COTE&CIEL',  
167 - des: '这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生',  
168 - link: '/ ',  
169 - btnText: '去看看'  
170 - },  
171 - {  
172 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
173 - name: 'COTE&CIEL',  
174 - des: '这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生',  
175 - link: '/ ',  
176 - btnText: '去看看'  
177 - },  
178 - {  
179 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
180 - name: 'COTE&CIEL',  
181 - des: '这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生',  
182 - link: '/ ',  
183 - btnText: '去看看'  
184 - },  
185 - {  
186 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
187 - name: 'COTE&CIEL',  
188 - des: '这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生',  
189 - link: '/ ',  
190 - btnText: '去看看' 230 + ]
191 } 231 }
192 - ]  
193 - },  
194 - {  
195 - adBanner: {  
196 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
197 - link: ''  
198 - }  
199 - },  
200 - {  
201 - floorZh: '资讯',  
202 - floorEn: 'EDITORIAL',  
203 - editorial: {  
204 - big: {  
205 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
206 - link: ''  
207 - },  
208 - small: [  
209 - {  
210 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
211 - link: '/',  
212 - bottomSpace: true,  
213 - rightSpace: true  
214 - },  
215 - {  
216 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
217 - link: '/',  
218 - bottomSpace: true  
219 - },  
220 - {  
221 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
222 - link: '/',  
223 - rightSpace: true  
224 - },  
225 - {  
226 - img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',  
227 - link: ''  
228 - }  
229 - ]  
230 } 232 }
231 - }  
232 ] 233 ]
233 }; 234 };
  235 + /* eslint-enable */
234 236
235 return content; 237 return content;
236 -} 238 +};
237 239
238 module.exports = { 240 module.exports = {
239 getContent: getContent 241 getContent: getContent
  1 +/**
  2 + * router of sub app channel
  3 + * @author: biao<bill.zhao@yoho.cn>
  4 + * @date: 2016/06/29
  5 + */
  6 +
  7 +'use strict';
  8 +
  9 +const router = require('express').Router(); // eslint-disable-line
  10 +const cRoot = './controllers';
  11 +
  12 +// Your controller here
  13 +
  14 +const index = require(`${cRoot}`).index;
  15 +
  16 +router.get('/', index);
  17 +
  18 +module.exports = router;
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 </div> 8 </div>
9 <div class="news right"> 9 <div class="news right">
10 {{# small}} 10 {{# small}}
11 - <img class="{{#if bottomSpace}}bottomSpace{{/if}} {{#if rightSpace}}rightSpace{{/if}}" src="{{image img 260 176}}" alt=""> 11 + <img class="{{#if bottomSpace}}bottom-space{{/if}} {{#if rightSpace}}right-space{{/if}}" src="{{image img 260 176}}" alt="">
12 {{/ small}} 12 {{/ small}}
13 </div> 13 </div>
14 {{/ editorial}} 14 {{/ editorial}}
@@ -2,9 +2,9 @@ require('../plugins/slider'); @@ -2,9 +2,9 @@ require('../plugins/slider');
2 $('.slide-container').slider(); 2 $('.slide-container').slider();
3 3
4 $('.card').mouseenter(function() { 4 $('.card').mouseenter(function() {
5 - var $this = $(this); 5 + var $this = $(this); // eslint-disable-line
6 6
7 - if($this.hasClass('active')) { 7 + if ($this.hasClass('active')) {
8 return false; 8 return false;
9 } 9 }
10 10
@@ -3,6 +3,8 @@ @@ -3,6 +3,8 @@
3 margin-top: 15px; 3 margin-top: 15px;
4 4
5 img { 5 img {
  6 + @extend .cursor-pointer;
  7 +
6 width: 100%; 8 width: 100%;
7 height: 100%; 9 height: 100%;
8 border: none; 10 border: none;
@@ -6,7 +6,6 @@ @@ -6,7 +6,6 @@
6 background-color: #fff; 6 background-color: #fff;
7 7
8 .ad { 8 .ad {
9 - display: inline-block;  
10 float: left; 9 float: left;
11 width: 50%; 10 width: 50%;
12 height: 100%; 11 height: 100%;
@@ -18,7 +17,6 @@ @@ -18,7 +17,6 @@
18 } 17 }
19 18
20 img { 19 img {
21 - display: inline-block;  
22 float: left; 20 float: left;
23 width: 50%; 21 width: 50%;
24 height: 100%; 22 height: 100%;
@@ -11,7 +11,6 @@ @@ -11,7 +11,6 @@
11 float: right; 11 float: right;
12 } 12 }
13 13
14 -  
15 img { 14 img {
16 float: left; 15 float: left;
17 } 16 }
@@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
3 $line-height: 1.8; 3 $line-height: 1.8;
4 $lines-to-show: 3; 4 $lines-to-show: 3;
5 5
6 - display: inline-block;  
7 float: left; 6 float: left;
8 height: 100%; 7 height: 100%;
9 width: 50%; 8 width: 50%;
@@ -10,14 +10,18 @@ @@ -10,14 +10,18 @@
10 display: inline-block; 10 display: inline-block;
11 box-sizing: border-box; 11 box-sizing: border-box;
12 12
13 - .bottomSpace { 13 + .bottom-space {
14 margin-bottom: $space; 14 margin-bottom: $space;
15 } 15 }
16 16
17 - .rightSpace { 17 + .right-space {
18 margin-right: $space; 18 margin-right: $space;
19 } 19 }
20 20
  21 + img {
  22 + @extend .cursor-pointer;
  23 + }
  24 +
21 &.left { 25 &.left {
22 width: $bigImgWidth; 26 width: $bigImgWidth;
23 float: left; 27 float: left;
@@ -146,7 +146,6 @@ @@ -146,7 +146,6 @@
146 right: 0; 146 right: 0;
147 top: 0; 147 top: 0;
148 bottom: 0; 148 bottom: 0;
149 - /*background: #000;*/  
150 } 149 }
151 150
152 span { 151 span {
@@ -443,7 +442,6 @@ @@ -443,7 +442,6 @@
443 } 442 }
444 } 443 }
445 444
446 -  
447 .categorys-list { 445 .categorys-list {
448 ul { 446 ul {
449 width: 1158px; 447 width: 1158px;
@@ -5,57 +5,55 @@ @@ -5,57 +5,55 @@
5 5
6 @extend .resource-container; 6 @extend .resource-container;
7 7
8 - height: calc($textHeight+$imgHeight+60px);/* 60px is the height of the floor header*/ 8 + height: calc($textHeight+$imgHeight+60px);/* 60px is the height of the floor header */
9 9
10 .arrival-item-box { 10 .arrival-item-box {
11 box-sizing: border-box; 11 box-sizing: border-box;
  12 + }
12 13
13 - .arrival-item {  
14 - width: 245px;  
15 - display: inline-block; 14 + .arrival-item {
  15 + width: 245px;
  16 + display: inline-block;
16 17
17 - .brand-name {  
18 - height: $textHeight;  
19 - text-align: center;  
20 - font-size: 12px; 18 + .brand-name {
  19 + height: $textHeight;
  20 + text-align: center;
  21 + font-size: 12px;
21 22
22 - span {  
23 - @extend .cursor-pointer; 23 + span {
  24 + @extend .cursor-pointer;
24 25
25 - padding-bottom: 3px;  
26 - border-bottom: 1px solid #000; 26 + padding-bottom: 3px;
  27 + border-bottom: 1px solid #000;
27 28
28 - &.top {  
29 - line-height: 20px;  
30 - } 29 + &.top {
  30 + line-height: 20px;
  31 + }
31 32
32 - &.bottom {  
33 - line-height: 40px;  
34 - } 33 + &.bottom {
  34 + line-height: 40px;
35 } 35 }
36 } 36 }
  37 + }
37 38
  39 + img {
  40 + @extend .cursor-pointer;
38 41
39 - img {  
40 - @extend .cursor-pointer;  
41 -  
42 - width: 100%;  
43 - height: $imgHeight;  
44 - }  
45 -  
46 - &.normal {  
47 - float: left;  
48 - margin-right: 18px;  
49 - } 42 + width: 100%;
  43 + height: $imgHeight;
  44 + }
50 45
51 - &.last {  
52 - float: right;  
53 - } 46 + &.normal {
  47 + float: left;
  48 + margin-right: 18px;
  49 + }
54 50
55 - &.small-img {  
56 - width: 160px;  
57 - } 51 + &.last {
  52 + float: right;
58 } 53 }
59 54
  55 + &.small-img {
  56 + width: 160px;
  57 + }
60 } 58 }
61 } 59 }
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 $width: 164px; 2 $width: 164px;
3 $height: 240px; 3 $height: 240px;
4 $space: 15px; 4 $space: 15px;
  5 + $buttonWidth: 105px;
5 6
6 @extend .resource-container; 7 @extend .resource-container;
7 8
@@ -14,16 +15,13 @@ @@ -14,16 +15,13 @@
14 15
15 .card { 16 .card {
16 height: $height; 17 height: $height;
17 - display: inline-block;  
18 float: left; 18 float: left;
19 position: relative; 19 position: relative;
20 box-sizing: border-box; 20 box-sizing: border-box;
21 21
22 -  
23 .img { 22 .img {
24 width: $width; 23 width: $width;
25 height: 100%; 24 height: 100%;
26 - display: inline-block;  
27 float: left; 25 float: left;
28 margin-right: $space; 26 margin-right: $space;
29 background-size: 100% 100%; 27 background-size: 100% 100%;
@@ -44,7 +42,6 @@ @@ -44,7 +42,6 @@
44 width: 0; 42 width: 0;
45 border: none; 43 border: none;
46 44
47 -  
48 p { 45 p {
49 height: calc($size*$line-height*$lines-to-show); 46 height: calc($size*$line-height*$lines-to-show);
50 width: calc($width-2*$space); 47 width: calc($width-2*$space);
@@ -58,7 +55,7 @@ @@ -58,7 +55,7 @@
58 } 55 }
59 56
60 button { 57 button {
61 - left: calc($width/2-105px/2); 58 + left: calc($width/2-$buttonWidth/2); /* stylelint-disable-line */
62 } 59 }
63 60
64 * { 61 * {
@@ -77,7 +74,6 @@ @@ -77,7 +74,6 @@
77 .brand-text-box { 74 .brand-text-box {
78 width: $width; 75 width: $width;
79 height: 100%; 76 height: 100%;
80 - display: inline-block;  
81 float: left; 77 float: left;
82 padding: 25px 0 25px $space; 78 padding: 25px 0 25px $space;
83 border: 1px solid #404040; 79 border: 1px solid #404040;
@@ -92,6 +88,5 @@ @@ -92,6 +88,5 @@
92 } 88 }
93 } 89 }
94 90
95 -  
96 } 91 }
97 } 92 }