ued / yohogirls-frontend · Commits

Go to a project

Authored by 2586703@qq.com
Commit 8eb86635f1dd4f3bf2b1f9a0b435ce218a7f772c 2 parents 755e3c17 e1ed36fc

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-frontend into develop

Inline Side-by-side
Showing 12 changed files with 135 additions and 75 deletions
@@ -24,3 +24,4 @@ spm_modules @@ -24,3 +24,4 @@ spm_modules
24 .cache 24 .cache
25 dist 25 dist
26 coverage 26 coverage
  27 +.sass-cache

1.62 KB | W: | H:

1.62 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.42 KB | W: | H:

2.74 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -387,6 +387,7 @@ dl, dt, dd, ul, li{ list-style:none;} @@ -387,6 +387,7 @@ dl, dt, dd, ul, li{ list-style:none;}
387 left:0; 387 left:0;
388 bottom:0; 388 bottom:0;
389 height:30px; 389 height:30px;
  390 + text-align:center;
390 position:absolute; 391 position:absolute;
391 z-index:9; 392 z-index:9;
392 } 393 }
@@ -8,16 +8,17 @@ @@ -8,16 +8,17 @@
8 } 8 }
9 .enterprise{ 9 .enterprise{
10 width:100%; 10 width:100%;
11 - height:126px; 11 + height:182px;
  12 + overflow:hidden;
12 margin:0 auto 6px; 13 margin:0 auto 6px;
13 background:#fff; 14 background:#fff;
14 .icons{background:url(../assets/images/phone.png) center no-repeat;} 15 .icons{background:url(../assets/images/phone.png) center no-repeat;}
15 .logo{ 16 .logo{
16 width:190px; 17 width:190px;
17 height:81px; 18 height:81px;
18 - margin: 12px auto 0 auto; 19 + margin: 31px auto 0 auto;
19 background:url(../assets/images/logo.png) no-repeat; 20 background:url(../assets/images/logo.png) no-repeat;
20 - margin-bottom:8px; 21 + margin-bottom:27px;
21 a{ 22 a{
22 @include blockwh(100%,100%); 23 @include blockwh(100%,100%);
23 } 24 }
@@ -185,11 +186,11 @@ @@ -185,11 +186,11 @@
185 } 186 }
186 } 187 }
187 .menu-item{ 188 .menu-item{
188 - display:block;height:43px;line-height:43px;float:left;margin:0 10px;cursor:pointer; 189 + display:block;height:43px;line-height:43px;float:left;cursor:pointer;
189 } 190 }
190 191
191 .menu-item-hk{ 192 .menu-item-hk{
192 - display:block;height:43px;line-height:43px;float:left;margin:0 10px;cursor:pointer 193 + display:block;height:43px;line-height:43px;float:left;cursor:pointer
193 } 194 }
194 195
195 196
@@ -203,13 +204,13 @@ @@ -203,13 +204,13 @@
203 204
204 .menu-item:hover{ 205 .menu-item:hover{
205 color:#fff; 206 color:#fff;
206 - display:block;height:43px;line-height:43px;float:left;margin:0 10px;cursor:pointer; 207 + display:block;height:43px;line-height:43px;float:left;cursor:pointer;
207 .submenu{display:block;} 208 .submenu{display:block;}
208 .submenu-withleft{display:block;} 209 .submenu-withleft{display:block;}
209 } 210 }
210 .menu-item-hk:hover{ 211 .menu-item-hk:hover{
211 color:#fff; 212 color:#fff;
212 - display:block;height:43px;line-height:43px;float:left;margin:0 10px;cursor:pointer; 213 + display:block;height:43px;line-height:43px;float:left;cursor:pointer;
213 .submenu{display:block;} 214 .submenu{display:block;}
214 .submenu-withleft{display:block;} 215 .submenu-withleft{display:block;}
215 } 216 }
@@ -279,7 +280,7 @@ @@ -279,7 +280,7 @@
279 } 280 }
280 .splitline{ 281 .splitline{
281 width:2px; 282 width:2px;
282 - height:28px; 283 + height:25px;
283 display:block; 284 display:block;
284 float:right; 285 float:right;
285 margin-top:8px; 286 margin-top:8px;
@@ -288,13 +289,15 @@ @@ -288,13 +289,15 @@
288 .search-text{ 289 .search-text{
289 float:right; 290 float:right;
290 height:43px; 291 height:43px;
291 - font-size:17px;  
292 - line-height:43px; 292 + font-size:19px;
  293 + letter-spacing:4px;
  294 + font-weight:bold;
  295 + line-height:42px;
293 @include fontstyle; 296 @include fontstyle;
294 cursor:pointer; 297 cursor:pointer;
295 padding:0 10px; 298 padding:0 10px;
296 color:#000; 299 color:#000;
297 - width:73px; 300 + width:120px;
298 display:none; 301 display:none;
299 302
300 } 303 }
@@ -346,29 +349,29 @@ @@ -346,29 +349,29 @@
346 } 349 }
347 350
348 .scrollPic-content{ 351 .scrollPic-content{
349 - width:1190px; 352 + width:1080px;
350 height:537px; 353 height:537px;
351 margin:28px auto 0; 354 margin:28px auto 0;
352 position:relative; 355 position:relative;
353 text-align:center; 356 text-align:center;
354 - background:url(../assets/images/loading.gif) center no-repeat; 357 + background:url(../assets/images/loading.gif) center no-repeat #fff;
355 overflow:hidden; 358 overflow:hidden;
356 /* Fix of Webkit flickering */ 359 /* Fix of Webkit flickering */
357 .swiper-container{ 360 .swiper-container{
358 - width:992px;  
359 - height:504px;  
360 - background:url(../assets/images/loading.gif) center no-repeat; 361 + width:1080px;
  362 + height:507px;
  363 + background:url(../assets/images/loading.gif) center no-repeat #fff;
361 } 364 }
362 .swiper-slide{ 365 .swiper-slide{
363 - width:992px;  
364 - height:505px; 366 + width:1080px;
  367 + height:507px;
365 overflow:hidden; 368 overflow:hidden;
366 - a{@include blockwh(992px,505px);background:url(../assets/images/loading.gif) center no-repeat #fff;} 369 + a{@include blockwh(1080px,508px);background:url(../assets/images/loading.gif) center no-repeat #fff;}
367 img{ 370 img{
368 - width:990px; 371 + width:1080px;
369 display:block; 372 display:block;
370 margin: 0 auto; 373 margin: 0 auto;
371 - height:505px; 374 + height:507px;
372 } 375 }
373 } 376 }
374 .pagination { 377 .pagination {
@@ -381,22 +384,24 @@ @@ -381,22 +384,24 @@
381 384
382 .arrow{ 385 .arrow{
383 position:absolute; 386 position:absolute;
384 - top:50%;margin-top:-43px; 387 + top:50%;
  388 + margin-top:-50px;
385 cursor:pointer; 389 cursor:pointer;
  390 + z-index:666;
386 @include blockwh(50px,50px); 391 @include blockwh(50px,50px);
387 background:url(../assets/images/nextprev.png) no-repeat; 392 background:url(../assets/images/nextprev.png) no-repeat;
388 } 393 }
389 .arrow-left{ 394 .arrow-left{
390 background-position:left top; 395 background-position:left top;
391 - left:0; 396 + left:45px;
392 } 397 }
393 - .arrow-right{background-position:right top;right:0;} 398 + .arrow-right{background-position:right top;right:45px;}
394 } 399 }
395 400
396 .tv-area{ 401 .tv-area{
397 width:1080px; 402 width:1080px;
398 height:125px; 403 height:125px;
399 - margin:10px auto 0; 404 + margin:22px auto 0;
400 .tv{ 405 .tv{
401 display:block; 406 display:block;
402 float:left; 407 float:left;
@@ -881,7 +886,7 @@ @@ -881,7 +886,7 @@
881 { 886 {
882 width:182px; 887 width:182px;
883 padding-left:5px; 888 padding-left:5px;
884 - height:30px; 889 + height:26px;
885 890
886 border:1px solid #000; 891 border:1px solid #000;
887 line-height:30px; 892 line-height:30px;
@@ -1005,7 +1010,8 @@ @@ -1005,7 +1010,8 @@
1005 .menu-link-channel{ 1010 .menu-link-channel{
1006 font-size:24px; 1011 font-size:24px;
1007 color:#000; 1012 color:#000;
1008 - padding:0 15px; 1013 + letter-spacing:1px;
  1014 + line-height:38px;
1009 @include blockwh(100%,100%); 1015 @include blockwh(100%,100%);
1010 1016
1011 &:hover{ 1017 &:hover{
@@ -1014,13 +1020,22 @@ @@ -1014,13 +1020,22 @@
1014 } 1020 }
1015 1021
1016 .menu-link-magazine { 1022 .menu-link-magazine {
  1023 +
1017 background:url(../assets/images/magazine_icon.png) top right no-repeat; 1024 background:url(../assets/images/magazine_icon.png) top right no-repeat;
1018 padding-right:18px; 1025 padding-right:18px;
1019 - 1026 + margin-left:22px;
  1027 + width:147px;
1020 &:hover { 1028 &:hover {
1021 background:url(../assets/images/magazine_icon.png) bottom right no-repeat; 1029 background:url(../assets/images/magazine_icon.png) bottom right no-repeat;
1022 } 1030 }
1023 } 1031 }
  1032 + .menu-link-fashion {width:100px;}
  1033 + .menu-link-sports {width:100px;margin-left:41px;}
  1034 + .menu-link-lifestyle {width:100px;margin-left:31px;}
  1035 + .menu-link-beauty {width:100px;margin-left:46px;}
  1036 + .menu-link-vedio {width:100px;margin-left:49px;}
  1037 +
  1038 +
1024 1039
1025 1040
1026 .home-item-public { 1041 .home-item-public {
@@ -1113,7 +1128,7 @@ @@ -1113,7 +1128,7 @@
1113 @include blockwh(100%,70px); 1128 @include blockwh(100%,70px);
1114 line-height:90px; 1129 line-height:90px;
1115 text-align:center; 1130 text-align:center;
1116 - font-size:20px; 1131 + font-size:26px;
1117 } 1132 }
1118 .icons-content{ 1133 .icons-content{
1119 list-style:none; 1134 list-style:none;
@@ -1128,6 +1143,15 @@ @@ -1128,6 +1143,15 @@
1128 float:left; 1143 float:left;
1129 margin: 0 5px; 1144 margin: 0 5px;
1130 } 1145 }
  1146 +
  1147 + .li-china {
  1148 + width:80px;
  1149 + height:50px;
  1150 + line-height:50px;
  1151 + float:left;
  1152 + margin: 0 5px;
  1153 + }
  1154 +
1131 .icons{ 1155 .icons{
1132 cursor:pointer; 1156 cursor:pointer;
1133 @include blockwh(100%,100%); 1157 @include blockwh(100%,100%);
@@ -1174,7 +1198,7 @@ @@ -1174,7 +1198,7 @@
1174 { 1198 {
1175 width:182px; 1199 width:182px;
1176 padding-left:5px; 1200 padding-left:5px;
1177 - height:30px; 1201 + height:26px;
1178 1202
1179 border:1px solid #000; 1203 border:1px solid #000;
1180 line-height:30px; 1204 line-height:30px;
@@ -1199,14 +1223,90 @@ @@ -1199,14 +1223,90 @@
1199 height: 140px; 1223 height: 140px;
1200 float: left; 1224 float: left;
1201 margin: 20px 0 30px 0; 1225 margin: 20px 0 30px 0;
  1226 + position:relative;
  1227 + .link {
  1228 + display:block;
  1229 + width:100%;
  1230 + height:100%;
  1231 + cursor:pointer;
  1232 + }
  1233 +
  1234 +
  1235 + .swiper-container2,.swiper-container-single{
  1236 + width:1080px;
  1237 + height:140px;
  1238 + overflow:hidden;
  1239 + .swiper-slide{
  1240 + width:1080px;
  1241 + height:140px;
  1242 + overflow:hidden;
  1243 + background:url(../assets/images/loading.gif) center no-repeat;
  1244 + .img-a{
  1245 + @include blockwh(100%,100%);
  1246 + cursor:pointer;
  1247 + img{
  1248 + width:100%;
  1249 + height:100%;
  1250 + }
  1251 + }
  1252 + }
  1253 + }
  1254 +
  1255 + .pagination {
  1256 + display:inline-block;
  1257 + height:30px;
  1258 + text-align: center;
  1259 + }
  1260 +
  1261 +
1202 } 1262 }
1203 1263
1204 .bottom-item-container { 1264 .bottom-item-container {
1205 width: 1080px; 1265 width: 1080px;
1206 overflow: hidden; 1266 overflow: hidden;
1207 position: relative; 1267 position: relative;
1208 -  
1209 - .pop-container { 1268 + }
  1269 + .pager-content-default{
  1270 + text-align:center;
  1271 + width:711px;
  1272 + float:left;
  1273 + height:93px;
  1274 + line-height:93px;
  1275 + border-bottom:1px solid #000;
  1276 + border-top:1px solid #000;
  1277 +
  1278 + .channel-index-pager{
  1279 + height:60px;
  1280 + margin:20px auto;
  1281 + list-style:none;
  1282 + font-size:20px;
  1283 + display:inline-block;
  1284 + font-family:"MyWebFont";
  1285 + a{color:#000;}
  1286 + a.pager-item{
  1287 + cursor:pointer;
  1288 + width:50px;
  1289 + height:50px;
  1290 + float:left;
  1291 + line-height:50px;
  1292 + text-align:center;
  1293 + font-family:"MyWebFont";
  1294 +
  1295 + }
  1296 + a.ellipsis{
  1297 + width:50px;
  1298 + height:50px;
  1299 + float:left;
  1300 + line-height:50px;
  1301 + text-align:center;
  1302 +
  1303 + }
  1304 +
  1305 + .pager-item-choosen{color:#fff;background:url(../assets/images/pager_choosen.png) center top no-repeat;}
  1306 + }
  1307 + }
  1308 +
  1309 + .pop-container {
1210 width:342px; 1310 width:342px;
1211 height:646px; 1311 height:646px;
1212 position:absolute; 1312 position:absolute;
@@ -1281,48 +1381,6 @@ @@ -1281,48 +1381,6 @@
1281 } 1381 }
1282 1382
1283 } 1383 }
1284 - }  
1285 - .pager-content-default{  
1286 - text-align:center;  
1287 - width:711px;  
1288 - float:left;  
1289 - height:93px;  
1290 - line-height:93px;  
1291 - border-bottom:1px solid #000;  
1292 - border-top:1px solid #000;  
1293 -  
1294 - .channel-index-pager{  
1295 - height:60px;  
1296 - margin:20px auto;  
1297 - list-style:none;  
1298 - font-size:20px;  
1299 - display:inline-block;  
1300 - font-family:"MyWebFont";  
1301 - a{color:#000;}  
1302 - a.pager-item{  
1303 - cursor:pointer;  
1304 - width:50px;  
1305 - height:50px;  
1306 - float:left;  
1307 - line-height:50px;  
1308 - text-align:center;  
1309 - font-family:"MyWebFont";  
1310 -  
1311 - }  
1312 - a.ellipsis{  
1313 - width:50px;  
1314 - height:50px;  
1315 - float:left;  
1316 - line-height:50px;  
1317 - text-align:center;  
1318 -  
1319 - }  
1320 -  
1321 - .pager-item-choosen{color:#fff;background:url(../assets/images/pager_choosen.png) center top no-repeat;}  
1322 - }  
1323 - }  
1324 -  
1325 -  
1326 1384
1327 1385
1328 1386
@@ -246,7 +246,7 @@ @@ -246,7 +246,7 @@
246 float:right; 246 float:right;
247 width:221px; 247 width:221px;
248 height:41px; 248 height:41px;
249 - background:#fff; 249 + /*background:#fff;*/
250 position:relative; 250 position:relative;
251 251
252 252