g4s merge 충돌 수정

This commit is contained in:
chicpro
2013-07-31 15:32:25 +09:00
15 changed files with 417 additions and 75 deletions

View File

@ -554,6 +554,7 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
/* 공통 */
.tr_bg {background:#f5f6fa}
.td_addr {text-align:left !important}
.td_chk {width:30px;text-align:center}
.td_smallstat {width:50px;text-align:center}
.td_num {width:60px;text-align:center}
@ -564,9 +565,10 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.td_odrnum3 {width:110px;text-align:center}
.td_grid {width:60px;text-align:center}
.td_mbid, .td_name, .td_mbname {width:100px;text-align:left !important}
.td_addr {text-align:left !important}
.td_date {width:80px;text-align:center}
.td_time {width:150px;text-align:center}
.td_date {width:70px;text-align:center}
.td_time {width:130px;text-align:center}
.td_boolean {width:50px;text-align:center}
.td_pt {text-align:right !important}
.td_sendcost_by {width:50px;text-align:center}
@ -579,8 +581,14 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.txt_true {color:#e8180c}
.txt_false {color:#ccc}
.banner_or_img {margin:10px 0 0}
.banner_or_img button {display:block;margin:5px 0 0}
.txt_active {color:#5d910b}
.txt_expired {color:#ccc}
/* 환경설정 */
.cf_cert_kcp_hide {display:none}
/* 관리권한설정 */
#add_admin fieldset {margin-top:20px}