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-24 09:06:49 +09:00
parent 979af49812 84e0bdab8c
commit f594b2ec66
28 changed files with 58 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
skin/board/basic/list.skin.php
View File

@ -86,7 +86,7 @@ if ($is_nogood) $colspan++;
</td>
<?php if ($is_checkbox) { ?>
<td class="td_chk">
<label for="chk_wr_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['wr_subject'] ?></label>
<label for="chk_wr_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['subject'] ?></label>
<input type="checkbox" name="chk_wr_id[]" value="<?php echo $list[$i]['wr_id'] ?>" id="chk_wr_id_<?php echo $i ?>">
</td>
<?php } ?>

2
skin/board/basic/style.css
View File

@ -31,7 +31,7 @@
.cnt_cmt {font-weight:bold}
#bo_sch {margin-bottom:10px;padding-top:5px;text-align:center}
#bo_sch legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
#bo_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
/* 게시판 읽기 */
#bo_v {margin-bottom:20px;padding-bottom:20px}

2
skin/board/gallery/list.skin.php
View File

@ -58,7 +58,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
?>
<li class="bo_img_list_li <?php if ($wr_id == $list[$i]['wr_id']) { ?>bo_img_now<?php } ?>" style="<?php echo $style ?>width:<?php echo $board['bo_gallery_width'] ?>px">
<?php if ($is_checkbox) { ?>
<label for="chk_wr_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['wr_subject'] ?></label>
<label for="chk_wr_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['subject'] ?></label>
<input type="checkbox" name="chk_wr_id[]" value="<?php echo $list[$i]['wr_id'] ?>" id="chk_wr_id_<?php echo $i ?>">
<?php } ?>
<span class="sound_only">

2
skin/board/gallery/style.css
View File

@ -55,7 +55,7 @@
.bo_current {color:#e8180c}
#bo_sch {margin-bottom:10px;padding-top:5px;text-align:center}
#bo_sch legend {width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#bo_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
/* 게시판 읽기 */
#bo_v {margin-bottom:20px;padding-bottom:20px}