g4s merge 충돌 수정

This commit is contained in:
chicpro
2013-05-24 09:06:49 +09:00
28 changed files with 58 additions and 34 deletions

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 } ?>

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}