#1567 Merge branch 'feature/xedition-responsive' into develop

This commit is contained in:
bnu 2015-07-06 18:18:19 +09:00
parent 3e7a1c1544
commit 95ceccdac2
20 changed files with 169 additions and 1334 deletions

View file

@ -1,30 +1,30 @@
<div data-src="{$layout_info->path}img/slider_img.jpg">
<div class="camera_caption fadeIn">
<div class="camera_caption_wrap">
<div style="background-image:url('{$layout_info->path}img/slider_img.jpg');" class="swiper-slide">
<div>
<div>
<h1>SHARING, PUBLISHING.<br />&amp; PLEASURE.</h1>
<p>지식을 나누고 컨텐츠를 출판하며 즐거움을 함께합니다.</p>
</div>
</div>
</div>
<div data-src="{$layout_info->path}img/slider_img2.jpg">
<div class="camera_caption fadeIn">
<div class="camera_caption_wrap">
<div style="background-image:url('{$layout_info->path}img/slider_img2.jpg');" class="swiper-slide">
<div>
<div>
<h1>MAKING<br />WEB CULTURES</h1>
<p>올바른 웹 문화를 지향합니다.</p>
</div>
</div>
</div>
<div data-src="{$layout_info->path}img/slider_img3.jpg">
<div class="camera_caption fadeIn">
<div class="camera_caption_wrap">
<div style="background-image:url('{$layout_info->path}img/slider_img3.jpg');" class="swiper-slide">
<div>
<div>
<h1>EVOLUTION &amp; INNOVATION<br />TOGETHER</h1>
<p>함께 진화하고 혁신을 추구합니다.</p>
</div>
</div>
</div>
<div data-src="{$layout_info->path}img/slider_img4.jpg">
<div class="camera_caption fadeIn">
<div class="camera_caption_wrap">
<div style="background-image:url('{$layout_info->path}img/slider_img4.jpg');" class="swiper-slide">
<div>
<div>
<h1>CREATE A GOOD DESIGN WITH<br />THE POSSIILITY OF TECHNOLOGY</h1>
<p>기술의 가능성을 발굴하고 좋은 디자인을 만들어 갑니다.</p>
</div>

View file

@ -1,6 +1,6 @@
<!-- WelcomeXE -->
<div class="welcomeXE">
<section class="xeicon">
<section class="xeicon bg-holder" data-width="1240" data-height="500">
<h1>Beautiful iconpack<br>XEIcon</h1>
<div class="button-area">
<a class="btn_item" target="_blank" href="http://xpressengine.github.io/XEIcon">HOMEPAGE</a>