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
2013-10-14 14:37:51 +09:00
parent e0f890d8d0 d3f41c99d7
commit 74788a221b
7 changed files with 156 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
css/admin.css
View File

@ -51,7 +51,7 @@ h2.h2_frm {padding-top:15px}
#gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1dli {z-index:13;clear:both;zoom:1}
.gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1dli a {display:block;float:left;width:110px;height:35px;color:#e0e0e0;font-weight:bold;line-height:2.95em;text-decoration:none}
.gnb_1dli a {display:block;float:left;padding:10px 0;width:110px;color:#e0e0e0;font-weight:bold;text-decoration:none}
.gnb_1dli a:focus, .gnb_1dli a:hover {text-decoration:none}
.gnb_2dul {float:left;width:auto}
.gnb_2dli {float:left}
@ -62,10 +62,10 @@ h2.h2_frm {padding-top:15px}
.gnb_js #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_js .gnb_1dli {clear:none;position:relative;float:left;margin:0 0 0 -1px;border:1px solid #333;border-top:0;border-bottom:0}
.gnb_js .gnb_1dli a {color:#fff;text-align:center}
.gnb_js .gnb_1dli_air a {float:none;background:#222;color:#fff}
.gnb_js .gnb_1dli_on a {float:none;background:#fff;color:#000}
.gnb_js .gnb_2dul {display:none;position:absolute;top:35px;width:181px;border:1px solid #999;border-top:0;background:#fff}
.gnb_js .gnb_2dli a {display:inline-block;float:none;padding:0 10px;width:161px;background:#fff;color:#000;text-align:left}
.gnb_js .gnb_1dli_air a {float:none;background:#fff;color:#000}
.gnb_js .gnb_1dli_on a {float:none;background:#282828;color:#fff}
.gnb_js .gnb_2dul {display:none;position:absolute;top:34px;width:181px;border:1px solid #999;border-top:0;background:#fff}
.gnb_js .gnb_2dli a {display:inline-block;float:none;padding:8px 10px;width:161px;background:#fff;color:#000;text-align:left}
.gnb_js .gnb_2dli a:focus, .gnb_js .gnb_2dli a:hover {background:#484848;color:#fff}
.gnb_1dli_over .gnb_2dul {display:block;left:-1px}
.gnb_1dli_over2 .gnb_2dul {display:block;right:-1px}
@ -74,7 +74,9 @@ h2.h2_frm {padding-top:15px}
.gnb_js .gnb_grp_style:focus, .gnb_js .gnb_grp_style:hover {background:#484848 !important}
.gnb_js .gnb_grp_div {border-top:1px solid #eee}
#lnb {margin:0;padding:10px 15px;list-style:none;zoom:1}
#lnb {margin:0;padding:10px 15px;border-bottom:1px solid #e9e9e9;list-style:none;zoom:1}
#lnb:after {display:block;visibility:hidden;clear:both;content:""}
#lnb li {float:left}
#lnb a {display:inline-block;padding:5px;font-size:0.95em;letter-spacing:-0.1em}
@ -393,10 +395,6 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
/* 메일 테스트 */
#fsendmailtest {margin-bottom:20px;padding:30px 0;border:1px solid #ced9de;background:#fff;text-align:center}
/* 세션파일일괄삭제 */
#session_del p, #cache_del p {margin-bottom:20px;padding:13px;border:1px solid #ced9de;background:#fff}
#session_del p span, #cache_del p span {color:#ff3061}
/* ########## 쇼핑몰 사용시 적용 ########## */
/* 쇼핑몰 설정 */
@ -460,30 +458,34 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
#sodr_request_list p {position:relative;padding:5px 0;border-bottom:1px solid #e9e9e9}
/* 주문통합내역 */
#sodr_sort {margin:0 20px 20px;padding:0;list-style:none;zoom:1}
#sodr_sort:after {display:block;visibility:hidden;clear:both;content:""}
#sodr_sort li {float:left;margin:0 10px 0 0}
#sodr_sort a {font-size:0.95em;text-decoration:underline;letter-spacing:-0.1em}
#sodr_sort a.sort_on {color:#ff3061}
#sodr_all {margin:0 20px}
#sodr_all h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#sodr_all .btn_list {margin:10px 0}
.sodr_all_list {clear:both;margin:0;padding:10px 0 0;border-top:25px solid #f7f7f7;list-style:none}
.sodr_all_list li {margin:0 20px 10px;border-bottom:5px solid #f7f7f7}
.sodr_all_list th {text-align:center}
.sodr_all_list {clear:both;margin:0 0 50px;padding:0;list-style:none}
.sodr_all_list .sodr_basic {float:left;zoom:1}
.sodr_all_list .sodr_basic:after {display:block;visibility:hidden;clear:both;content:""}
.sodr_all_list .sodr_basic dt {float:left;margin:0 10px 0 0}
.sodr_all_list .sodr_basic dd {float:left;margin:0 30px 0 0}
.sodr_all_list .sodr_basic strong a {color:#ff3061}
.sodr_all_list .sodr_basic strong a {color:#ff3061;text-decoration:underline}
.sodr_all_list .sodr_person {float:right;zoom:1}
.sodr_all_list .sodr_person:after {display:block;visibility:hidden;clear:both;content:""}
.sodr_all_list .sodr_person dt {float:left;margin:0 0 0 30px}
.sodr_all_list .sodr_person dd {float:left;margin:0 0 0 10px}
.sodr_all_list .sodr_pay {clear:both;margin:0;border-top:1px solid #606060;border-bottom:1px solid #606060;zoom:1}
.sodr_all_list .sodr_pay {clear:both;margin:0;border-top:1px solid #d1dee2;zoom:1}
.sodr_all_list .sodr_pay:after {display:block;visibility:hidden;clear:both;content:""}
.sodr_all_list .sodr_pay dt {float:left;padding:10px 0;width:15%}
.sodr_all_list .sodr_pay dd {float:left;margin:0;padding:10px 0;width:35%}
.sodr_all_list .sodr_pay dt {float:left;padding:8px 0;width:15%}
.sodr_all_list .sodr_pay dd {float:left;margin:0;padding:8px 0;width:35%}
#sodr_total table {text-align:center}
#sodr_total th {width:125px}