쇼핑몰: SNS 아이콘 위치 및 상품 목록 마크업 스타일 점검 중 merge 충돌 수정

This commit is contained in:
whitedot
2013-11-26 11:10:57 +09:00
19 changed files with 46 additions and 216 deletions

View File

@ -75,7 +75,7 @@ include_once(G5_SHOP_PATH.'/shop.head.php');
$list->set_view('it_id', false);
$list->set_view('it_name', true);
$list->set_view('it_basic', true);
$list->set_view('it_cust_price', false);
$list->set_view('it_cust_price', true);
$list->set_view('it_price', true);
$list->set_view('it_icon', true);
$list->set_view('sns', true);
@ -96,7 +96,7 @@ include_once(G5_SHOP_PATH.'/shop.head.php');
$list->set_view('it_id', false);
$list->set_view('it_name', true);
$list->set_view('it_basic', true);
$list->set_view('it_cust_price', false);
$list->set_view('it_cust_price', true);
$list->set_view('it_price', true);
$list->set_view('it_icon', true);
$list->set_view('sns', true);
@ -117,7 +117,7 @@ include_once(G5_SHOP_PATH.'/shop.head.php');
$list->set_view('it_id', false);
$list->set_view('it_name', true);
$list->set_view('it_basic', true);
$list->set_view('it_cust_price', false);
$list->set_view('it_cust_price', true);
$list->set_view('it_price', true);
$list->set_view('it_icon', true);
$list->set_view('sns', true);