firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g5 merge 충돌수정

Browse Source
This commit is contained in:
chicpro
2014-04-10 17:25:42 +09:00
parent 4340f6ad72 e28584cef7
commit 64e3027fbf
11 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/skin/search/basic/search.skin.php
View File

@ -75,9 +75,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
<h2><?php echo $stx ?> 전체검색 결과</h2>
<dl>
<dt>게시판</dt>
<dd><strong style="color:<?php echo $config['cf_search_color'] ?>"><?php echo $board_count ?>개</strong></dd>
<dd><strong class="sch_word"><?php echo $board_count ?>개</strong></dd>
<dt>게시물</dt>
<dd><strong style="color:<?php echo $config['cf_search_color'] ?>"><?php echo number_format($total_count) ?>개</strong></dd>
<dd><strong class="sch_word"><?php echo number_format($total_count) ?>개</strong></dd>
</dl>
<p><?php echo number_format($page) ?>/<?php echo number_format($total_page) ?> 페이지 열람 중</p>
</section>