Merge branch 'master' of http://git.scdxtc.com/zwesy/chaoyu
						commit
						79a1fecc1c
					
				|  | @ -182,12 +182,18 @@ input,select,textarea{outline:medium none; resize: none;} | ||||||
| 
 | 
 | ||||||
| .all-title-box2 span{ display: block; font-size: 2.7rem;} | .all-title-box2 span{ display: block; font-size: 2.7rem;} | ||||||
| .all-title-box2 p{ font-size: 1.125rem; color: #666; margin-top: 0.1875rem;} | .all-title-box2 p{ font-size: 1.125rem; color: #666; margin-top: 0.1875rem;} | ||||||
| 
 | .disFlex{display: flex;justify-content: space-between} | ||||||
| .about-box1{ height: 100vh; position: relative;} | .about-box1{ height: 100vh; position: relative;} | ||||||
| .about-box1::after{ content: ''; width: 100%; height: 30vh; background: url(../image/ab1_bg.jpg) no-repeat center; position: absolute; left: 0; bottom: 0; z-index: -1;} | .about-box1::after{ content: ''; width: 100%; height: 30vh; background: url(../image/ab1_bg.jpg) no-repeat center; position: absolute; left: 0; bottom: 0; z-index: -1;} | ||||||
| .about-box1 .pull-left{ width: 42%;} | .about-box1 .pull-left{ width: 42%; overflow: hidden;} | ||||||
|  | .about-box1 .pull-left .imgH{ | ||||||
|  |     width: 100%; | ||||||
|  | } | ||||||
|  | .about-box1 .disFlex{ | ||||||
|  |     align-items: flex-end; | ||||||
|  | } | ||||||
| .about-box1 .pull-right{ width: 55%;} | .about-box1 .pull-right{ width: 55%;} | ||||||
| .about-box1 .pull-right .box-info{ font-size: 0.875rem; color: #999; line-height: 1.6; margin-top: 1.25rem;} | .about-box1 .pull-right .box-info{ font-size: 16px; color: #999; line-height: 1.6; margin-top: 1.25rem;} | ||||||
| 
 | 
 | ||||||
| .about-box2{ padding: 6rem 0;} | .about-box2{ padding: 6rem 0;} | ||||||
| #about3{ | #about3{ | ||||||
|  |  | ||||||
|  | @ -51,7 +51,7 @@ | ||||||
|                 <ul> |                 <ul> | ||||||
|                     {foreach $items as $item} |                     {foreach $items as $item} | ||||||
|                     <li> |                     <li> | ||||||
|                         <a href="{:url('article/detail', ['id' => $item.id, 'source'=>$categoryId])}"> |                         <a> | ||||||
|                             <span><img src="{:getImgSrc($item, '__IMG__/default_bg.jpg')}" ></span><p>{$item.title}</p> |                             <span><img src="{:getImgSrc($item, '__IMG__/default_bg.jpg')}" ></span><p>{$item.title}</p> | ||||||
|                         </a> |                         </a> | ||||||
|                     </li> |                     </li> | ||||||
|  |  | ||||||
|  | @ -11,8 +11,8 @@ | ||||||
| <!--  Company  --> | <!--  Company  --> | ||||||
| <div class="all-center-box"> | <div class="all-center-box"> | ||||||
|     <div class="about-box1 w-100 center-center" id="about1"> |     <div class="about-box1 w-100 center-center" id="about1"> | ||||||
|         <div class="w-1200"> |         <div class="w-1200 disFlex"> | ||||||
|             <div class="pull-left"><img src="{$blocks['company']['img']['value'] ?? ''}" ></div> |             <div class="pull-left"><img class="imgH" src="{$blocks['company']['img']['value'] ?? ''}" ></div> | ||||||
|             <div class="pull-right"> |             <div class="pull-right"> | ||||||
|                 <div class="all-title-box2 w-100"><span>{$blocks['company']['title']['value'] ?? ''}</span><p>{$blocks['company']['subtitle']['value'] ?? ''}</p></div> |                 <div class="all-title-box2 w-100"><span>{$blocks['company']['title']['value'] ?? ''}</span><p>{$blocks['company']['subtitle']['value'] ?? ''}</p></div> | ||||||
|                 <div class="box-info w-100">{:nl2br($blocks['company']['description']['value'] ?? '')}</div> |                 <div class="box-info w-100">{:nl2br($blocks['company']['description']['value'] ?? '')}</div> | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue