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-03 15:56:56 +09:00
parent 46b20261ff 04d6043b65
commit 713bb97d35
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
css/mobile_shop.css
View File

@ -195,10 +195,11 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none}
#smb_my_ov {margin:0 0 20px}
#smb_my_ov h2 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden}
#smb_my_ov dl {margin:0;border-top:1px solid #e9e9e9;background:#f2f5f9}
#smb_my_ov dl {margin:0;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:#f2f5f9}
#smb_my_ov dl:after {display:block;visibility:hidden;clear:both;content:''}
#smb_my_ov dt {float:left;padding:10px;width:30%;border-bottom:1px solid #e9e9e9;font-weight:bold}
#smb_my_ov dd {margin:0;padding:10px 0;border-bottom:1px solid #e9e9e9}
#smb_my_ov dt {float:left;padding:10px 3%;width:24%;border-bottom:1px solid #e9e9e9;font-weight:bold}
#smb_my_ov dd {float:left;margin:0;padding:10px 0;width:70%;border-bottom:1px solid #e9e9e9}
#smb_my_ov .ov_addr {border-bottom:0}
#smb_my_od {margin:0 0 15px}
#smb_my_od h2 {margin:0 0 10px}

4
mobile/shop/mypage.php
View File

@ -40,8 +40,8 @@ for($k=0; $cp=sql_fetch_array($res); $k++) {
<dd><?php echo $member['mb_today_login']; ?></dd>
<dt>회원가입일시</dt>
<dd><?php echo $member['mb_datetime']; ?></dd>
<dt>주소</dt>
<dd><?php echo sprintf("(%s-%s)", $member['mb_zip1'], $member['mb_zip2']).' '.print_address($member['mb_addr1'], $member['mb_addr2']); ?></dd>
<dt class="ov_addr">주소</dt>
<dd class="ov_addr"><?php echo sprintf("(%s-%s)", $member['mb_zip1'], $member['mb_zip2']).' '.print_address($member['mb_addr1'], $member['mb_addr2']); ?></dd>
</dl>
</section>