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

@ -98,7 +98,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</aside>
<div class="btn_win">
<a href="javascript:;" onclick="window.close();">창닫기</a>
<button type="button" onclick="window.close();">창닫기</button>
</div>
</div>

View File

@ -43,7 +43,7 @@
#poll_result_cmt footer {text-align:right}
#poll_result_wcmt {margin-bottom:10px;width:93%}
.poll_cmt_del a {display:inline-block;padding-bottom:10px}
#poll_result_oth {margin:0 auto 20px}
#poll_result_oth {margin:0 auto 20px;width:93%}
#poll_result_oth h2 {padding:0 0 10px}
#poll_result_oth ul {margin:0;padding:0;list-style:none}
#poll_result_oth a {display:block;padding:10px 0;border-bottom:1px solid #eee}