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
2014-03-17 11:56:57 +09:00
parent ce74f3beb8 dd43ca449e
commit 952c431a64
3 changed files with 72 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
css/default.css
View File

@ -81,7 +81,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
.gnb_1dli_on .gnb_2da {background-color:#333;color:#fff}
.gnb_2da:focus, .gnb_2da:hover {background:#666;text-decoration:none}
.gnb_1dli_over .gnb_2dul {display:block;left:0;background:#fff}
.gnb_1dli_over2 .gnb_2dul {display:block;right:1px;background:#fff}
.gnb_1dli_over2 .gnb_2dul {display:block;right:0;background:#fff}
.gnb_empty {width:100%;height:35px;text-align:center;line-height:2.95em}

33
css/mobile.css
View File

@ -35,16 +35,24 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
#hd:after {display:block;visibility:hidden;clear:both;content:""}
#hd_h1 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden}
#logo {float:left;padding:15px 0;margin-left:5px}
#logo {padding:15px 10px}
#hd_sch_open {position:absolute;top:10px;right:10px;padding:0 10px;height:2.6em;border:0;background:#333;color:#fff;font-size:1em;letter-spacing:-0.1em;vertical-align:top;-webkit-appearance:none}
#gnb_open {position:absolute;top:10px;right:60px;padding:0 10px;height:2.6em;border:0;background:#333;color:#fff;font-size:1em;letter-spacing:-0.1em}
#gnb {display:none;background:#282828}
#gnb a {display:block;color:#efefef}
.gnb_1da {padding:10px;border-top:1px solid #191919}
.gnb_2dul {background:#383838}
.gnb_2da {padding:10px;border-top:1px solid #282828}
.gnb_2da span:before {display:inline-block;margin:0 10px 0 0;color:#666;content:'▶'}
#gnb_close {display:block;margin:0;padding:10px 0;width:100%;border:0;background:#000;color:#fff}
#hd_sch {display:none;z-index:10;position:absolute;top:0;left:0;width:100%;height:100%;background:#f2f5f9;text-align:center}
#hd_sch h2 {margin:0 0 10px}
#hd_sch .sch_inner {padding:10px 0 0}
#hd_sch .frm_input {height:2.5em;border-color:#999;background:#fff;line-height:2.5em}
#hd_sch .btn_submit {height:2.7em}
#hd_sch .pop_close {position:absolute;bottom:5px;right:5px;padding:7px;border:0;background:#626870;color:#fff}
#hd_sch_open {position:absolute;top:10px;right:10px;padding:0 10px;height:2.6em;border:0;background:#333;color:#fff;font-size:1em;letter-spacing:-0.1em}
#hd_sch {display:none;border-top:1px solid #181818;background:#282828;text-align:center}
#hd_sch h2 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden}
#hd_sch form {position:relative;padding:30px 0}
#hd_sch #sch_stx {height:30px;border:1px solid #181818;background:#323232 !important;line-height:2.5em;vertical-align:middle}
#hd_sch #sch_submit {margin:0;padding:0 10px;height:32px;border:0;background:#000;color:#fff;vertical-align:middle}
#hd_sch #sch_close {display:block;margin:0;padding:10px 0;width:100%;border:0;background:#000;color:#fff}
#hd_nb {clear:both;background:#ecf0f7;text-align:center}
#hd_nb li {display:inline-block}
@ -73,15 +81,6 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
.ts_up2 {font-size:1.3em !important}
/* 하단 레이아웃 */
#gnb {border-top:1px solid #dde4e9;border-bottom:1px solid #dde4e9;background:#f0f4f8}
#gnb:after {display:block;visibility:hidden;clear:both;content:""}
#gnb h2 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
#gnb li {float:left;margin:0 0 -1px;width:25%;border-bottom:1px solid #dde4e9}
#gnb li ul {display:none}
#gnb li a {display:block;padding:10px 0;border-right:1px solid #e7f1ed;color:#000;text-align:center;text-decoration:none}
.gnb_empty {float:none !important;padding:30px 0;width:100% !important;text-align:center}
#ft {;border-top:1px solid #dde4e9;background:#f2f5f9}
#ft h1 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
#ft p {margin:0;padding:10px 0;line-height:1.8em}

147
mobile/head.php
View File

@ -21,7 +21,6 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
<?php include G5_MOBILE_PATH.'/newwin.inc.php'; // 팝업레이어 ?>
</div>
<?php } ?>
<div class="to_content"><a href="#gnb">메인메뉴 바로가기</a></div>
<div id="hd_wrapper">
@ -29,10 +28,10 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
<a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="<?php echo $config['cf_title']; ?>"></a>
</div>
<button type="button" id="hd_menu_open">메뉴<span class="sound_only"> 열기</span></button>
<button type="button" id="gnb_open" class="hd_opener">메뉴<span class="sound_only"> 열기</span></button>
<div id="menu_wrap">
<ul>
<div id="gnb" class="hd_div">
<ul id="gnb_1dul">
<?php
$sql = " select *
from {$g5['menu_table']}
@ -43,7 +42,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
for($i=0; $row=sql_fetch_array($result); $i++) {
?>
<li>
<li class="gnb_1dli">
<a href="<?php echo $row['me_link']; ?>" target="_<?php echo $row['me_target']; ?>" class="gnb_1da"><?php echo $row['me_name'] ?></a>
<?php
$sql2 = " select *
@ -58,7 +57,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
if($k == 0)
echo '<ul class="gnb_2dul">'.PHP_EOL;
?>
<li class="gnb_2dli"><a href="<?php echo $row2['me_link']; ?>" target="_<?php echo $row2['me_target']; ?>" class="gnb_2da"><?php echo $row2['me_name'] ?></a></li>
<li class="gnb_2dli"><a href="<?php echo $row2['me_link']; ?>" target="_<?php echo $row2['me_target']; ?>" class="gnb_2da"><span></span><?php echo $row2['me_name'] ?></a></li>
<?php
}
@ -72,96 +71,63 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
if ($i == 0) { ?><li class="gnb_empty">생성된 메뉴가 없습니다.</li><?php }
?>
</ul>
<button type="button" id="hd_menu_close">닫기</button>
<button type="button" id="gnb_close" class="hd_closer"><span class="sound_only">메뉴 </span>닫기</button>
</div>
<button type="button" id="hd_sch_open" class="hd_opener">검색<span class="sound_only"> 열기</span></button>
<div id="hd_sch" class="hd_div">
<h2>사이트 내 전체검색</h2>
<form name="fsearchbox" action="<?php echo G5_BBS_URL ?>/search.php" onsubmit="return fsearchbox_submit(this);" method="get">
<input type="hidden" name="sfl" value="wr_subject||wr_content">
<input type="hidden" name="sop" value="and">
<input type="text" name="stx" id="sch_stx" placeholder="검색어(필수)" required class="required" maxlength="20">
<input type="submit" value="검색" id="sch_submit">
</form>
<script>
function fsearchbox_submit(f)
{
if (f.stx.value.length < 2) {
alert("검색어는 두글자 이상 입력하십시오.");
f.stx.select();
f.stx.focus();
return false;
}
// 검색에 많은 부하가 걸리는 경우 이 주석을 제거하세요.
var cnt = 0;
for (var i=0; i<f.stx.value.length; i++) {
if (f.stx.value.charAt(i) == ' ')
cnt++;
}
if (cnt > 1) {
alert("빠른 검색을 위하여 검색어에 공백은 한개만 입력할 수 있습니다.");
f.stx.select();
f.stx.focus();
return false;
}
return true;
}
</script>
<button type="button" id="sch_close" class="hd_closer"><span class="sound_only">검색 </span>닫기</button>
</div>
<script>
$(function() {
$("#hd_menu_open").click(function() {
var $menu = $("#menu_wrap");
var w = $menu.width();
var sw = $(window).width();
$menu
.css({
display: "none",
left: sw+"px"
})
.css("display", "block")
.animate(
{ left: "-="+w+"px" }, 1500
);
$(function (){
var $hd_div = $(".hd_div");
$(".hd_opener").click(function(){
$hd_div.hide();
$(this).next(".hd_div").show();
});
$("#hd_menu_close").click(function() {
var $menu = $("#menu_wrap");
var w = $menu.width();
var sw = $(window).width();
$menu.animate(
{ left: "+="+w+"px" }, 1500,
function() {
$menu.css("display", "none");
}
);
$(".hd_closer").click(function(){
$hd_div.hide();
});
});
</script>
<button type="button" id="hd_sch_open">검색<span class="sound_only"> 열기</span></button>
<aside id="hd_sch">
<div class="sch_inner">
<h2>사이트 내 전체검색</h2>
<form name="fsearchbox" action="<?php echo G5_BBS_URL ?>/search.php" onsubmit="return fsearchbox_submit(this);" method="get">
<input type="hidden" name="sfl" value="wr_subject||wr_content">
<input type="hidden" name="sop" value="and">
<input type="text" name="stx" id="sch_stx" placeholder="검색어(필수)" required class="frm_input required" maxlength="20">
<input type="submit" value="검색" class="btn_submit">
<button type="button" class="pop_close"><span class="sound_only">검색 </span>닫기</button>
</form>
<script>
function fsearchbox_submit(f)
{
if (f.stx.value.length < 2) {
alert("검색어는 두글자 이상 입력하십시오.");
f.stx.select();
f.stx.focus();
return false;
}
// 검색에 많은 부하가 걸리는 경우 이 주석을 제거하세요.
var cnt = 0;
for (var i=0; i<f.stx.value.length; i++) {
if (f.stx.value.charAt(i) == ' ')
cnt++;
}
if (cnt > 1) {
alert("빠른 검색을 위하여 검색어에 공백은 한개만 입력할 수 있습니다.");
f.stx.select();
f.stx.focus();
return false;
}
return true;
}
</script>
</div>
</aside>
<script>
$(function (){
var $hd_sch = $("#hd_sch");
$("#hd_sch_open").click(function(){
$hd_sch.css("display","block");
});
$("#hd_sch .pop_close").click(function(){
$hd_sch.css("display","none");
});
});
</script>
<ul id="hd_nb">
<li><a href="<?php echo G5_BBS_URL ?>/qalist.php" id="snb_new">1:1문의</a></li>
<li><a href="<?php echo G5_BBS_URL ?>/faq.php" id="snb_faq">FAQ</a></li>
@ -177,9 +143,6 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
<li><a href="<?php echo G5_BBS_URL ?>/register.php" id="snb_join">회원가입</a></li>
<li><a href="<?php echo G5_BBS_URL ?>/login.php" id="snb_login">로그인</a></li>
<?php } ?>
<?php if (defined('G5_USE_SHOP') && G5_USE_SHOP) { ?>
<li><a href="<?php echo G5_SHOP_URL ?>/">쇼핑몰</a></li>
<?php } ?>
</ul>
</div>