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
2014-01-17 14:50:17 +09:00
parent a58f0220ce adaca820b5
commit 06724ad172
4 changed files with 230 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
skin/member/basic/style.css
View File

@ -158,6 +158,7 @@
#mb_confirm p {padding:20px;border:1px solid #dde4e9;border-bottom:0;background:#fff}
#mb_confirm p strong {display:block}
#mb_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center}
#mb_confirm fieldset .frm_input {background-color:#fff !important}
#mb_confirm label {letter-spacing:-0.1em}
#mb_confirm_id {display:inline-block;margin-right:20px;font-weight:bold}
@ -167,6 +168,7 @@
#pw_confirm p {padding:20px;border:1px solid #dde4e9;border-bottom:0;background:#fff}
#pw_confirm p strong {display:block}
#pw_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center}
#pw_confirm fieldset .frm_input {background-color:#fff !important}
#pw_confirm label {letter-spacing:-0.1em}
#pw_confirm_id {display:inline-block;margin-right:20px;font-weight:bold}
@ -180,13 +182,14 @@
#profile h2 {margin:0}
/* 우편번호 검색 */
#post_code p {margin:0 20px 10px}
#post_code #code_sch {margin:0 20px}
#post_code #code_sel {margin:0 20px 20px}
#post_code #code_sel label {display:inline-block;margin:0 15px 0 0}
#post_code p {margin:0 0 10px}
#post_code .btn_submit {padding:0 8px;height:24px}
#post_code #zip_search_frm {margin:0 20px}
#post_code #code_sch #sch_q {position:relative;margin:5px 0 0}
#post_code #code_sch #q_info {display:none;z-index:2;position:absolute;top:33px;left:0;padding:5px;background:#e4eaec}
#post_code #code_sch #q_info span {position:absolute;top:-6px;left:5px;width:11px;height:6px;background:url('img/zip_ico_up.gif')}
#post_code #code_sch .btn_submit {padding:0 8px;height:24px}
#post_code #result {margin:0 20px}
#post_code #result_b4 {display:block;padding:30px 0;border-bottom:1px solid #dde4e9;text-align:center}
#post_code #result .result_msg {padding:15px 0}
#post_code #result .result_fail {border:1px solid #dde4e9;background:#f0f5fc;color:#ff3061;text-align:center}
@ -194,4 +197,6 @@
#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:"▶ "}
#post_code #zip_direct_frm {display:none;margin:0 20px}
#post_code #zip_direct_frm .frm_input, #post_code #zip_direct_frm .btn_submit {margin:0 0 5px}