g4s merge 충돌 수정

This commit is contained in:
chicpro
2013-05-29 09:06:13 +09:00
104 changed files with 10830 additions and 654 deletions

View File

@ -4,8 +4,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<link rel="stylesheet" href="<?php echo $latest_skin_url ?>/style.css">
<section class="lat">
<h2 class="lat_title"><a href="<?php echo G4_BBS_URL ?>/board.php?bo_table=<?php echo $bo_table ?>"><?php echo $bo_subject ?></a></h2>
<div class="lt">
<strong class="lt_title"><a href="<?php echo G4_BBS_URL ?>/board.php?bo_table=<?php echo $bo_table ?>"><?php echo $bo_subject ?></a></strong>
<ul>
<?php for ($i=0; $i<count($list); $i++) { ?>
<li>
@ -37,5 +37,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<li>게시물이 없습니다.</li>
<?php } ?>
</ul>
<div class="lat_more"><a href="<?php echo G4_BBS_URL ?>/board.php?bo_table=<?php echo $bo_table ?>"><span class="sound_only"><?php echo $bo_subject ?></span>더보기</a></div>
</section>
<div class="lt_more"><a href="<?php echo G4_BBS_URL ?>/board.php?bo_table=<?php echo $bo_table ?>"><span class="sound_only"><?php echo $bo_subject ?></span>더보기</a></div>
</div>

View File

@ -1,7 +1,7 @@
/* 새글 스킨 (latest) */
.lat_pc {float:left;margin-left:20px}
.lat {position:relative;float:left;margin-bottom:20px;padding-bottom:10px;width:354px;height:150px;border-bottom:1px solid #ddd}
.lat ul {margin:0 0 10px;padding:0;list-style:none}
.lat li {padding:3px 0}
.lat_title {display:block;padding:10px 0 8px}
.lat_more {position:absolute;top:10px;right:0}
.lt_pc {float:left;margin-left:20px}
.lt {position:relative;float:left;margin-bottom:20px;padding-bottom:10px;width:354px;height:150px;border-bottom:1px solid #ddd}
.lt ul {margin:0 0 10px;padding:0;list-style:none}
.lt li {padding:3px 0}
.lt_title {display:block;padding:10px 0 8px}
.lt_more {position:absolute;top:10px;right:0}