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:
whitedot
2013-10-11 17:58:58 +09:00
parent cc336f02fc 7cc386d7a8
commit bbd5174c6f
81 changed files with 787 additions and 2982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
css/admin.css
View File

@ -493,7 +493,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
.frm_sit_title {margin:5px 0 0}
/* 상품입력/수정 */
#sit_compact {padding:15px 0;border:1px solid #e9e9e9;background:#f7f7f7;text-align:center}
#sit_compact {margin:0 20px;padding:15px 0;border:1px solid #e9e9e9;background:#f7f7f7;text-align:center}
.sit_w_opt {height:70px !important}
.sit_wimg {display:none}

2
css/default.css
View File

@ -32,7 +32,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
#sch_all {position:absolute;top:22px;left:170px;margin:0;padding:0;border:1px solid #555}
#sch_all legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
#sch_all #sch_all_stx {padding-left:5px;width:165px;height:24px;border:0;background:#fff;line-height:1.9em !important;line-height:1.6em}
#sch_all_submit {padding:0 5px;height:26px;border:0;background:#555;color:#fff}
#sch_all_submit {padding:0 5px;height:26px;border:0;background:#555;color:#fff;cursor:pointer}
#tnb {position:absolute;top:18px;right:0;margin:0;padding:0;list-style:none;zoom:1}
#tnb:after {display:block;visibility:hidden;clear:both;content:""}