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

g4s merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-05-31 08:57:58 +09:00
parent 462f843175 37734d3abc
commit 2f80daf2d5
30 changed files with 471 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mobile/skin/board/basic/style.css
View File

@ -48,7 +48,7 @@
/* 게시판 읽기 */
#bo_v {margin-bottom:1.5em;padding-bottom:1.5em}
#bo_v_cate {padding:0 1em;color:#999;font-size:0.9em;font-weight:bold}
#bo_v_table {padding:0 1em;color:#999;font-size:0.9em;font-weight:bold}
#bo_v_title {padding:0 0.7em 0.5em;font-size:1.2em}
@ -105,6 +105,10 @@
#bo_v_act strong {color:#ff3061}
#bo_v_act_good, #bo_v_act_nogood {display:inline-block;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#bo_v_sns {margin:0 0 2em;padding:0;list-style:none;zoom:1}
#bo_v_sns:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_sns li {float:left;margin:0 0.5em 0 0}
#bo_v form {padding-top:1.5em}
/* 게시판 댓글 */
@ -134,4 +138,9 @@
#bo_vc_w #char_cnt {display:block;margin-bottom:0.3em}
#bo_vc_w textarea {width:99%}
#bo_vc_sns {margin:0;padding:0;list-style:none;zoom:1}
#bo_vc_sns:after {display:block;visibility:hidden;clear:both;content:""}
#bo_vc_sns li {float:left;margin:0 1em 0 0}
#bo_vc_sns input {margin:0 0 0 0.5em}
#bo_vc form {padding:0}

4
mobile/skin/board/basic/view.skin.php
View File

@ -165,6 +165,10 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
}
}
?>
<?php
// SNS 보내기
@include(G4_SKIN_PATH."/board/basic/view.sns.skin.php");
?>
</section>
<?php

3
mobile/skin/board/basic/view_comment.skin.php
View File

@ -112,6 +112,9 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<td><?php echo $captcha_html; ?></td>
</tr>
<?php } ?>
<?php
@include(G4_SKIN_PATH."/board/basic/view_comment.sns.skin.php");
?>
<tr>
<th scope="row">내용</th>
<td>

4
mobile/skin/board/gallery/view.skin.php
View File

@ -165,6 +165,10 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
}
}
?>
<?php
// SNS 보내기
@include(G4_SKIN_PATH."/board/basic/view.sns.skin.php");
?>
</section>
<?php

3
mobile/skin/board/gallery/view_comment.skin.php
View File

@ -112,6 +112,9 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<td><?php echo $captcha_html; ?></td>
</tr>
<?php } ?>
<?php
@include(G4_SKIN_PATH."/board/basic/view_comment.sns.skin.php");
?>
<tr>
<th scope="row">내용</th>
<td>