firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g5 merge 충돌수정

Browse Source
This commit is contained in:
chicpro
2013-10-02 09:13:33 +09:00
parent 21c09985d7 0a1259b3a5
commit 5e05a31146
44 changed files with 811 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
css/admin.css
View File

@ -517,9 +517,12 @@ td {padding:8px 5px;border:1px solid #e9e9e9;line-height:1.5em;word-break:break-
#point_mng {margin-top:50px}
/* 회원메일발송 목록 */
.td_test, .td_send {width:50px;text-align:center}
<<<<<<< HEAD
.td_mng {width:100px;text-align:center}
.td_smallmng {width:70px;text-align:center}
=======
>>>>>>> g5
/* 투표관리 목록 */
.td_etc {width:80px;text-align:center}
/* 게시판관리 목록 */
@ -558,29 +561,32 @@ td {padding:8px 5px;border:1px solid #e9e9e9;line-height:1.5em;word-break:break-
.td_addr {text-align:left !important}
.td_boolean {width:50px;text-align:center}
.td_boolean {width:50px;text-align:center}
.td_chk {width:30px;text-align:center}
.td_callnum {width:80px;text-align:center}
.td_date {width:70px;text-align:center}
.td_grid {width:60px;text-align:center}
.td_mbid, .td_name, .td_mbname {width:100px;text-align:left !important}
.td_smallstat {width:50px;text-align:center}
.td_mng {width:100px;text-align:center}
.td_mngsmall {width:50px;text-align:center}
.td_num {width:60px;text-align:center}
.td_numbig {width:100px;text-align:center}
.td_numsmall {width:30px;text-align:center}
.td_smallnum {width:40px;text-align:center}
.td_bignum {width:100px;text-align:center}
.td_odrnum {width:250px;text-align:center}
.td_odrnum2 {width:200px;text-align:center}
.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_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}
.td_sendcost_add {width:100px;text-align:center}
.td_payby {width:80px;text-align:center}
.td_postal {width:60px;text-align:center}
.td_bigpostal {width:140px;text-align:center}
.td_pt {text-align:right !important}
.td_sendcost_by {width:50px;text-align:center}
.td_sendcost_add {width:100px;text-align:center}
.td_tdiv {border-bottom:1px solid #c9c9c9 !important}
.td_time {width:130px;text-align:center}
.txt_true {color:#e8180c}
.txt_false {color:#ccc}