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
2013-12-05 16:34:18 +09:00
parent 3efeae844f 6b7142565e
commit e0d487199a
16 changed files with 91 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,7 @@
/* 회원가입 약관 */
#fregister section {margin:0 0 20px;padding:20px 0;border-bottom:3px solid #eee}
#fregister h2 {margin:0 0 20px;text-align:center}
#fregister textarea {display:block;margin-bottom:10px;padding:5px;width:98%;height:150px;border:1px solid #d9d9d9;background:#f7f7f7}
#fregister textarea {display:block;margin-bottom:10px;padding:5px;width:98%;height:150px;border:1px solid #e9e9e9;background:#f7f7f7}
#fregister .fregister_agree {padding:10px 0 0;text-align:right}
#fregister .fregister_agree label {display:inline-block;margin-right:5px}
#fregister p {color:#e8180c;text-align:center}
@ -99,7 +99,7 @@
/* 회원가입 완료 */
#reg_result {padding:50px 0 0}
#reg_result #result_logo {margin-bottom:50px;text-align:center}
#reg_result #result_email {padding:10px 50px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#fff;line-height:2em}
#reg_result #result_email {padding:10px 50px;border-top:1px solid #e9e9e9;border-bottom:1px solid #dde4e9;background:#fff;line-height:2em}
#reg_result #result_email span {display:inline-block;width:150px}
#reg_result #result_email strong {color:#e8180c;font-size:1.2em}
#reg_result .btn_confirm {margin:50px 0}
@ -118,8 +118,8 @@
#mb_login #login_fs label {letter-spacing:-0.1em}
#mb_login #login_fs .login_id {position:absolute;top:26px;left:95px}
#mb_login #login_fs .login_pw {position:absolute;top:52px;left:95px}
#mb_login #login_fs .frm_input {display:block;margin:0 0 5px 80px}
#mb_login #login_fs .btn_submit {position:absolute;top:20px;left:335px;height:49px}
#mb_login #login_fs .frm_input {display:block;margin:0 0 5px 80px;width:162px}
#mb_login #login_fs .btn_submit {position:absolute;top:20px;right:95px;width:60px;height:53px}
#mb_login #login_info {margin:0 0 30px;padding:20px;border:1px solid #cfded8;background:#f5f6fa}
#mb_login #login_info div {text-align:right}
@ -140,10 +140,7 @@
/* 쪽지 */
#memo_view_contents {margin:0 auto 20px;width:90%}
#memo_view_contents h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#memo_view_ul {margin:0;padding:0 0 10px;border-bottom:1px solid #eee;list-style:none}
.memo_view_li {position:relative;padding:5px 0}
.memo_view_subj {display:inline-block;width:65px}
#memo_view_ul a {}
#memo_view section p {padding:10px;min-height:150px;height:auto !important;height:150px;background:#fff}
#memo_write textarea {height:100px}
@ -155,18 +152,18 @@
/* 회원 패스워드 확인 */
#mb_confirm {margin:0 auto;padding:100px 0;width:500px}
#mb_confirm h1 {margin:0 0 20px;font-size:1.3em}
#mb_confirm p {padding:20px;border:1px solid #d9d9d9;border-bottom:0;background:#fff}
#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 #d9d9d9;background:#f5f6fa;text-align:center}
#mb_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center}
#mb_confirm label {letter-spacing:-0.1em}
#mb_confirm_id {display:inline-block;margin-right:20px;font-weight:bold}
/* 비밀글 패스워드 확인 */
#pw_confirm {margin:0 auto;padding:100px 0;width:500px}
#pw_confirm h1 {margin:0 0 20px;font-size:1.3em}
#pw_confirm p {padding:20px;border:1px solid #d9d9d9;border-bottom:0;background:#fff}
#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 #d9d9d9;background:#f5f6fa;text-align:center}
#pw_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center}
#pw_confirm label {letter-spacing:-0.1em}
#pw_confirm_id {display:inline-block;margin-right:20px;font-weight:bold}
@ -180,11 +177,11 @@
#profile h2 {margin:0}
/* 우편번호 검색 */
#post_code fieldset {margin:0 auto 10px;padding:15px 10px;width:87%;text-align:center}
#post_code dl {margin:0 auto 10px;padding:20px 10px;width:87%;border-right:1px solid #eee;border-bottom:1px solid #eee;background:#fff}
#post_code fieldset {margin:0 20px 10px;padding:15px 10px;text-align:center}
#post_code dl {margin:0 auto 10px;padding:20px 10px;width:87%;border:1px solid #dde4e9;background:#fff}
#post_code dt {margin-bottom:15px;color:#000}
#post_code dd {margin:0;padding:0}
#post_code ul {margin:0;padding:0;list-style:none}
#post_code li a {display:block;padding:8px 0 6px;border-bottom:1px solid #eee}
#post_code li a {display:block;padding:8px 0 6px;border-bottom:1px solid #}
#post_code p {margin:0 auto 30px;width:90%}
.post_code {display:inline-block;width:50px;color:#999}