Merge branch 'master' into itemuse

Conflicts:
	adm/shop_admin/index.php
This commit is contained in:
gnuboard
2013-06-14 16:58:48 +09:00
23 changed files with 416 additions and 519 deletions

View File

@ -482,7 +482,7 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
/* 회원메일발송 목록 */
.td_test, .td_send {width:50px;text-align:center}
.td_mng {width:100px;text-align:center}
.td_smallmng {width:50px;text-align:center}
.td_smallmng {width:70px;text-align:center}
/* 투표관리 목록 */
.td_etc {width:80px;text-align:center}
@ -524,6 +524,8 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.td_time {width:150px;text-align:center}
.td_boolean {width:50px;text-align:center}
.td_pt {text-align:right !important}
.td_sendcost_by {width:50px;text-align:center}
.td_payby {width:80px;text-align:center}
.td_tdiv {border-bottom:1px solid #c9c9c9 !important}
.txt_true {color:#e8180c}