6c905440 by 任超

Merge branch 'master' of yun.pashanhoo.com:renchao/portalStaticPage

2 parents 3f1bf107 11e2e0b8
...@@ -82,7 +82,6 @@ div.top-logo .top_logo_search i { ...@@ -82,7 +82,6 @@ div.top-logo .top_logo_search i {
82 82
83 .top-logo h1 { 83 .top-logo h1 {
84 display: inline-block; 84 display: inline-block;
85 float: left;
86 } 85 }
87 86
88 /*------------------首页 end------------*/ 87 /*------------------首页 end------------*/
...@@ -226,11 +225,6 @@ div.navigation { ...@@ -226,11 +225,6 @@ div.navigation {
226 width: 1200px; 225 width: 1200px;
227 margin: 0 auto; 226 margin: 0 auto;
228 } 227 }
229
230 .left {
231 border-right: 1px solid #DEDEDE;
232 }
233
234 .right { 228 .right {
235 width: 400px; 229 width: 400px;
236 } 230 }
...@@ -243,7 +237,6 @@ div.navigation { ...@@ -243,7 +237,6 @@ div.navigation {
243 display: block; 237 display: block;
244 padding-top: 10px; 238 padding-top: 10px;
245 height: 150px; 239 height: 150px;
246 border-bottom: 1px solid #DEDEDE;
247 cursor: pointer; 240 cursor: pointer;
248 } 241 }
249 242
...@@ -264,7 +257,13 @@ div.navigation { ...@@ -264,7 +257,13 @@ div.navigation {
264 .xw-right { 257 .xw-right {
265 padding-right: 10px; 258 padding-right: 10px;
266 } 259 }
267 260 .leftContainer{
261 border-right: 1px solid #DEDEDE;
262 margin-top: 61px;
263 }
264 .leftContainer li:last-child{
265 border-bottom: 1px solid #DEDEDE;
266 }
268 .left-top { 267 .left-top {
269 width: 408px; 268 width: 408px;
270 height: 18px; 269 height: 18px;
...@@ -272,13 +271,14 @@ div.navigation { ...@@ -272,13 +271,14 @@ div.navigation {
272 font-weight: bold; 271 font-weight: bold;
273 color: #4A4A4A; 272 color: #4A4A4A;
274 line-height: 18px; 273 line-height: 18px;
275 margin-bottom: 10px; 274 cursor: pointer;
276 } 275 }
277 276
278 .left-body { 277 .left-body {
279 width: 687px; 278 width: 687px;
280 height: 60px; 279 height: 60px;
281 font-size: 14px; 280 font-size: 14px;
281 font-family: PingFangSC-Regular, PingFang SC;
282 font-weight: 400; 282 font-weight: 400;
283 color: #6D7278; 283 color: #6D7278;
284 line-height: 21px; 284 line-height: 21px;
...@@ -291,11 +291,12 @@ div.navigation { ...@@ -291,11 +291,12 @@ div.navigation {
291 } 291 }
292 292
293 .left-buttom div:nth-child(2) { 293 .left-buttom div:nth-child(2) {
294 margin-left: 10px; 294 margin-left: 60px;
295 } 295 }
296 296
297 .left-buttom div { 297 .left-buttom div {
298 float: left; 298 float: left;
299 line-height: 57px
299 } 300 }
300 301
301 .left-buttom i { 302 .left-buttom i {
...@@ -350,9 +351,6 @@ div.navigation { ...@@ -350,9 +351,6 @@ div.navigation {
350 margin-bottom: 20px; 351 margin-bottom: 20px;
351 } 352 }
352 353
353 .tj {
354 /*margin-bottom: 10px;*/
355 }
356 354
357 .tj img { 355 .tj img {
358 width: 200px; 356 width: 200px;
......