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

merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2015-09-25 09:41:11 +09:00
parent 070cdf999a 20302f8312
commit 696140be06
12 changed files with 673 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
adm/css/admin.css
View File

@ -924,4 +924,10 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
#grp_color li span{width:10px;height:10px; display:inline-block;background:rgb(75, 178, 197);margin-right:5px;}
#grp_color li.color2 span{background:rgb(234, 162, 40);}
#chart_wr h5{text-align:center;border:1px solid #eee;padding:30px 0}
#chart_wr{margin:20px }
#chart_wr{margin:20px }
/*전송실패 문자 재전송 내역*/
.sms_table{padding:0 20px 40px;}
.sms_table table th{border:1px solid #ddd;padding:9px 0}
.sms_table table td{border:1px solid #ddd;text-align:center;width:16%;padding:9px 0}