g5 merge 충돌수정

2014-04-02 11:45:36 +09:00
parent 07feab5016 04059d0f71
commit 85b816636e
32 changed files with 124 additions and 102 deletions
--- a/adm/css/admin.css
+++ b/adm/css/admin.css
@ -367,7 +367,11 @@ tfoot td {font-weight:bold;text-align:center}

 /* 공통 */
 .td_addr {text-align:left !important}
+
 .td_alignc {text-align:center}
+
+.td_addr_line {line-height:2em}
+
 .td_amount {width:70px;text-align:center}
 .td_auth {width:100px;text-align:center}
 .td_auth_mbnick {width:200px}