g5 merge 충돌수정

This commit is contained in:
chicpro
2013-12-20 15:55:17 +09:00
13 changed files with 173 additions and 249 deletions

View File

@ -108,8 +108,8 @@
/* 아이디/패스워드 찾기 */
#find_info #mb_hp_label {display:inline-block;margin-left:10px}
#find_info #info_fs {margin:0 20px 20px;padding:10px 20px 15px;background:#fff}
#find_info #captcha {position:absolute;top:110px;right:35px}
#find_info #info_fs {margin:0 20px 20px;padding:0;background:#fff}
#find_info #captcha {margin:0 20px}
/* 로그인 */
#mb_login {margin:0 auto;padding:100px 0;width:500px}
@ -181,14 +181,16 @@
/* 우편번호 검색 */
#post_code p {margin:0 20px 10px}
#post_code #code_sch {margin:0 20px}
#post_code #code_sch div {margin:5px 0 0}
#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}
#post_code #result ul {margin:0;padding:0;border-bottom:1px solid #dde4e9;background:#f0f5fc;list-style:none}
#post_code #result li {padding:0 10px 10px;border:1px solid #dde4e9;border-bottom:0}
#post_code #result li a {display:block;padding:10px 0 4px}
#post_code #result li div {color:#738D94}
#post_code #result li div:before {content:"▶ "}
#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:"▶ "}