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
2013-05-09 14:19:19 +09:00
parent 2af0caca38 868d3f94da
commit 3e9fcac5aa
4 changed files with 4 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
css/mobile_shop.css
View File

@ -250,7 +250,7 @@ input.required:focus {border:1px solid #b8c9c2;background:#21272e !important;col
/* ##### maintype(nn).inc.php, list.skin.(nn).php 공통 적용 시작 ##### */
/* 공통 */
.sct_wrap {margin:0 0 30px;zoom:1}
.sct_wrap {margin:0 2em 2em;zoom:1}
.sct_wrap:after {display:block;visibility:hidden;clear:both;content:""}
.sct_wrap header {margin:0 0 20px;zoom:1}
.sct_wrap header:after {display:block;visibility:hidden;clear:both;content:""}
@ -277,58 +277,6 @@ input.required:focus {border:1px solid #b8c9c2;background:#21272e !important;col
.sct_10 .sct_icon {position:absolute;top:10px;left:-5px;margin:0 !important}
.sct_10 .sct_icon img {display:block}
.sct_10 .sct_sns {position:absolute;top:190px;right:20px}
/* 상품 목록 스킨 11 */
.sct_11 .sct_li {float:left;margin:0 25px 0 0;width:230px}
.sct_11 .sct_last {margin:0 !important}
.sct_11 .sct_clear {clear:both}
.sct_11 .sct_a {display:block;position:relative;padding:0 0 5px;background:#f5f6fa;text-decoration:none}
.sct_11 .sct_a:focus,
.sct_11 .sct_a:hover {text-decoration:none}
.sct_11 .sct_img {display:block;margin:0 0 15px}
.sct_11 b {display:block;margin:0 0 8px;padding:0 5px;font-weight:normal}
.sct_11 s {display:block}
.sct_11 .sct_cost {display:block;margin:0 0 10px;padding:0 5px;font-weight:bold}
.sct_11 .sct_icon {position:absolute;top:10px;left:-5px;margin:0 !important}
.sct_11 .sct_icon img {display:block}
.sct_11 .sct_sns {position:absolute;bottom:10px;right:10px}
/* 상품 목록 스킨 12 */
.sct_12 .sct_li {float:left;margin:0 16px 16px 0;width:362px}
.sct_12 .sct_last {margin:0 !important}
.sct_12 .sct_clear {clear:both}
.sct_12 .sct_arw_toleft {display:block;z-index:2;position:absolute;top:20px;left:221px;width:10px;height:19px;background:url('../img/shop/icon_arw_toleft.gif') no-repeat}
.sct_12 .sct_a {display:block;position:relative;padding:20px 10px 20px 240px;width:110px;height:190px;border:1px solid #e9e9e9;background:#f5f6fa;text-decoration:none}
.sct_12 .sct_a:focus,
.sct_12 .sct_a:hover {text-decoration:none}
.sct_12 .sct_img {position:absolute;top:0;left:0}
.sct_12 b {display:block;margin:0 0 15px;font-size:1.2em;letter-spacing:-0.1em}
.sct_12 p {margin:0 0 15px;padding:0;line-height:1.5em}
.sct_12 s {display:block}
.sct_12 .sct_cost {display:block;margin:0 0 10px;font-weight:bold}
.sct_12 .sct_icon {position:absolute;bottom:25px;left:-5px;margin:0 !important}
.sct_12 .sct_icon img {display:block}
.sct_12 .sct_sns {position:absolute;bottom:20px;right:10px}
/* 상품 목록 스킨 13 */
.sct_13 .sct_li {float:left;margin:0 0 16px 0;width:100%}
.sct_13 .sct_last {}
.sct_13 .sct_clear {clear:both}
.sct_13 .sct_arw_toleft {display:block;z-index:2;position:absolute;top:20px;left:221px;width:10px;height:19px;background:url('../img/shop/icon_arw_toleft.gif') no-repeat}
.sct_13 .sct_a {display:block;position:relative;padding:20px 10px 20px 240px;height:190px;border:1px solid #e9e9e9;background:#f5f6fa;text-decoration:none}
.sct_13 .sct_a:focus,
.sct_13 .sct_a:hover {text-decoration:none}
.sct_13 .sct_img {position:absolute;top:0;left:0}
.sct_13 b {display:block;margin:0 0 15px;font-size:1.2em;letter-spacing:-0.1em}
.sct_13 p {margin:0 0 15px;padding:0;line-height:1.5em}
.sct_13 s {display:block}
.sct_13 .sct_cost {display:block;margin:0 0 10px;font-weight:bold}
.sct_13 .sct_icon {position:absolute;bottom:25px;left:-5px;margin:0 !important}
.sct_13 .sct_icon img {display:block}
.sct_13 .sct_rel {position:absolute;bottom:20px;right:20px}
.sct_13 .sct_rel_ul {margin:0;padding:0;list-style:none}
.sct_13 .sct_rel_li {float:left;margin:0 0 0 10px}
.sct_13 .sct_sns {position:absolute;top:20px;right:20px}
/* ##### maintype(nn).inc.php, list.skin.(nn).php 공통 적용 끝 ##### */
/* 상품 상세보기 */

9
mobile/shop/maintype10.inc.php
View File

@ -4,13 +4,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
for ($i=1; $row=sql_fetch_array($result); $i++) {
$href = G4_SHOP_URL.'/item.php?it_id='.$row['it_id'];
if ($list_mod >= 2) { // 1줄 이미지 : 2개 이상
if ($i%$list_mod == 0) $sct_last = 'sct_last'; // 줄 마지막
else if ($i%$list_mod == 1) $sct_last = 'sct_clear'; // 줄 첫번째
else $sct_last = '';
} else { // 1줄 이미지 : 1개
$sct_last = 'sct_clear';
}
$sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
$sns_send = G4_SHOP_URL.'/sns_send.php?url='.urlencode(G4_SHOP_URL.'/item.php?it_id='.$row['it_id']);
@ -18,7 +11,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
if ($i == 1) echo '<ul class="sct sct_10">';
?>
<li class="sct_li <?php echo $sct_last; ?>">
<li class="sct_li">
<a href="<?php echo $href; ?>" class="sct_a">
<span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height); ?></span>
<b><?php echo stripslashes($row['it_name']); ?></b>

2
mobile/shop/shop.tail.php
View File

@ -28,7 +28,7 @@ $admin = get_admin("super");
<span><b>대표</b> <?php echo $default['de_admin_company_owner']; ?></span>
<span><b>개인정보관리책임자</b> <?php echo $default['de_admin_info_name']; ?></span><br>
<span><b>통신판매업신고번호</b> <?php echo $default['de_admin_tongsin_no']; ?></span>
<?php if ($default['de_admin_buga_no']) echo '<span>부가통신사업신고번호 '.$default['de_admin_buga_no'].'</span>'; ?><br>
<?php if ($default['de_admin_buga_no']) echo '<span><b>부가통신사업신고번호</b> '.$default['de_admin_buga_no'].'</span>'; ?><br>
Copyright &copy; 2001-2013 <?php echo $default['de_admin_company_name']; ?>. All Rights Reserved.
</p>
<a href="#" id="ft_totop">상단으로</a>

2
shop/shop.tail.php
View File

@ -28,7 +28,7 @@ $admin = get_admin("super");
<span><b>대표</b> <?php echo $default['de_admin_company_owner']; ?></span>
<span><b>개인정보관리책임자</b> <?php echo $default['de_admin_info_name']; ?></span><br>
<span><b>통신판매업신고번호</b> <?php echo $default['de_admin_tongsin_no']; ?></span>
<?php if ($default['de_admin_buga_no']) echo '<span>부가통신사업신고번호 '.$default['de_admin_buga_no'].'</span>'; ?><br>
<?php if ($default['de_admin_buga_no']) echo '<span><b>부가통신사업신고번호</b> '.$default['de_admin_buga_no'].'</span>'; ?><br>
Copyright &copy; 2001-2013 <?php echo $default['de_admin_company_name']; ?>. All Rights Reserved.
</p>
<a href="#" id="ft_totop">상단으로</a>