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
2014-03-20 14:56:39 +09:00
parent 93f3f971a4 bcc013bdcf
commit 91ae476e4e
70 changed files with 8342 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
adm/css/admin.css
View File

@ -46,7 +46,7 @@ h3 {margin:0 20px}
#tnb #tnb_logout a {color:#ff3061}
#tnb span {position:absolute;bottom:10px;left:0;width:100%;text-align:center}
/* gnb js off */
/* gnb */
#gnb {position:relative;z-index:12;min-width:999px;background:#383a3f}
#gnb h2 {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden}
#gnb_1dul {position:relative;margin:0 20px;padding:0;zoom:1}
@ -72,7 +72,7 @@ h3 {margin:0 20px}
#lnb:after {display:block;visibility:hidden;clear:both;content:""}
#lnb li {float:left}
#lnb a {display:inline-block;margin:0 0 0 10px;padding:0 10px 0 0;border-right:1px solid #ccc;font-size:0.95em;letter-spacing:-0.1em}
#lnb a {display:inline-block;padding:0 10px;border-right:1px solid #ccc;font-size:0.95em;letter-spacing:-0.1em}
/* 중간 레이아웃 */
#wrapper {z-index:5;margin:20px 0;min-width:1000px;zoom:1}
@ -133,10 +133,8 @@ h3 {margin:0 20px}
.btn_confirm02 a:focus {background:#555}
.btn_confirm03 {clear:both;margin-top:10px;text-align:right}
.btn_submit {margin:0;padding:0;border:0;background:#ff3061;color:#fff;cursor:pointer}
.btn_submit {background:#ff3061;cursor:pointer}
.btn_confirm .btn_submit {padding:0 15px;border:0;height:30px;color:#fff}
.btn_cancel {display:inline-block;padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;text-decoration:none}
a.btn_cancel {line-height:2.5em;vertical-align:middle}
@ -159,7 +157,7 @@ a.btn_cancel {line-height:2.5em;vertical-align:middle}
.btn_list {margin:0 20px 10px} /* 목록용 */
.btn_list01 {}
.btn_list01 input, .btn_list01 button, .btn_list01 a {display:inline-block;padding:10px;border:1px solid #ccc;background:#fafafa;text-decoration:none;cursor:pointer}
.btn_list01 input, .btn_list01 button, .btn_list01 a {display:inline-block;margin:0;padding:10px;border:1px solid #ccc;background:#fafafa;text-decoration:none;cursor:pointer}
.btn_list01 a:focus {background:#555}
.btn_list02 {}
@ -211,7 +209,7 @@ legend {position:absolute;width:0;height:0;font-size:0;line-height:0;text-indent
/* 하단 레이아웃 */
#ft {margin:20px 0;padding:10px 20px;min-width:960px;border-top:1px solid #d0d6d8}
#ft {clear:both;margin:20px 0;padding:10px 20px;min-width:960px;border-top:1px solid #d0d6d8}
/* 페이지 내 검색 */
@ -229,7 +227,7 @@ legend {position:absolute;width:0;height:0;font-size:0;line-height:0;text-indent
.local_sch02 strong {display:inline-block;width:80px}
.local_sch02 strong.sch_long {width:160px}
.local_sch02 label {display:inline-block;margin:0 5px 0 0}
.local_sch02 button {margin:0;padding:3px 5px;border:1px solid #ced9de;background:#f6f9fa;font-size:0.95em;cursor:pointer}
.local_sch02 button {margin:0;padding:5px;border:1px solid #ced9de;background:#f6f9fa;font-size:0.95em;vertical-align:middle;cursor:pointer}
/* 페이지 내 실행 */
.local_cmd {min-width:960px}
@ -248,7 +246,7 @@ legend {position:absolute;width:0;height:0;font-size:0;line-height:0;text-indent
.local_desc01 a {text-decoration:underline}
.local_desc02 {margin:0 20px 10px;min-width:960px} /* 주로 온라인 서식 관련 안내 내용에 사용 */
.local_desc02 p {padding:0}
.local_desc02 p {padding:0;line-height:1.8em}
/* 페이지 내 카운트 */
.local_ov {min-width:960px}
@ -437,6 +435,9 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
.txt_true {color:#e8180c}
.txt_false {color:#ccc}
.txt_succeed {color:#40b300}
.txt_fail {color:#ce4242}
.banner_or_img {margin:10px 0 0}
.banner_or_img button {display:block;margin:5px 0 0}
@ -774,6 +775,14 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
.new_win .tbl_wrap {margin:0 20px 20px;padding:0}
.new_win .win_btn {clear:both;padding:20px;text-align:center} /* 새창용 */
.new_win .win_btn button {display:inline-block;padding:0 10px;height:30px;border:0;background:#4b545e;color:#fff;line-height:2em;cursor:pointer}
.new_win .win_btn input {padding:0 10px;height:30px;line-height:2em}
.new_win .win_btn a {display:inline-block;padding:0 10px;height:30px;background:#4b545e;color:#fff;vertical-align:middle;line-height:2.4em}
.new_win .win_btn a:focus, .new_win .win_btn a:hover {text-decoration:none}
.new_win .local_sch, .new_win .local_cmd, .new_win .local_desc01, .new_win .local_desc02, .new_win .local_ov {min-width:320px}
/* 자바스크립트 alert 대안 */
@ -816,4 +825,4 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
#post_code #result ul {margin:0;padding:0;border-bottom:1px solid #dde4e9;background:#f0f5fc;list-style:none}
#post_code #result li {padding:10px;border:1px solid #dde4e9;border-bottom:0}
#post_code #result li div {margin:4px 0 0;color:#738D94}
#post_code #result li div:before {content:"▶ "}
#post_code #result li div:before {content:"▶ "}