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-06 09:00:24 +09:00
parent ccb9a20ddd 808908717d
commit f5b6154ebd
4 changed files with 72 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
css/default.css
View File

@ -29,10 +29,10 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
#logo {padding:26px 0} #logo {padding:26px 0}
/* 전체 검색 */ /* 전체 검색 */
#sch {position:absolute;top:22px;left:170px;margin:0;padding:0;border:1px solid #c3c6ca} #hd_sch {position:absolute;top:22px;left:170px;margin:0;padding:0;border:1px solid #c3c6ca}
#sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} #hd_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
#sch #sch_stx {padding-left:5px;width:110px;height:24px;border:0;background:#fff;line-height:1.9em !important;line-height:1.6em} #hd_sch #sch_stx {padding-left:5px;width:110px;height:24px;border:0;background:#fff;line-height:1.9em !important;line-height:1.6em}
#sch_submit {padding:0 5px;height:26px;border:0;background:#e2e6eb;color:#333;cursor:pointer} #hd_sch #sch_submit {padding:0 5px;height:26px;border:0;background:#e2e6eb;color:#333;cursor:pointer}
#tnb {position:absolute;top:18px;right:0;margin:0;padding:0;list-style:none;zoom:1} #tnb {position:absolute;top:18px;right:0;margin:0;padding:0;list-style:none;zoom:1}
#tnb:after {display:block;visibility:hidden;clear:both;content:""} #tnb:after {display:block;visibility:hidden;clear:both;content:""}

23
css/mobile.css
View File

@ -39,20 +39,25 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
#captcha #captcha_info {display:block;margin:5px 0 0;font-size:0.95em;letter-spacing:-0.1em} #captcha #captcha_info {display:block;margin:5px 0 0;font-size:0.95em;letter-spacing:-0.1em}
/* 상단 레이아웃 */ /* 상단 레이아웃 */
#hd {background:#fff} #hd {position:relative;background:#fff}
#hd:after {display:block;visibility:hidden;clear:both;content:""} #hd:after {display:block;visibility:hidden;clear:both;content:""}
#hd_h1 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} #hd_h1 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden}
#logo {float:left;padding:10px 0;margin-left:5px} #logo {float:left;padding:15px 0;margin-left:5px}
#sch {float:right;margin:7px 5px;border:1px solid #aaa;letter-spacing:-4px} #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}
#sch_stx {padding-left:3px;width:100px;height:24px;border:0;background:#fff;line-height:1.5em;-webkit-appearance:none}
#mb_nb {clear:both;background:#151515;text-align:center} #hd_sch {display:none;z-index:10;position:absolute;top:0;left:0;width:100%;height:100%;background:#f2f5f9;text-align:center}
#mb_nb li {display:inline-block;border-right:1px solid #333} #hd_sch h2 {margin:0 0 10px}
#mb_nb li:nth-last-of-type(1) {border-right:0 !important} #hd_sch .sch_inner {padding:10px 0 0}
#mb_nb a {display:inline-block;padding:10px 7px;color:#fff;text-decoration:none} #hd_sch .frm_input {height:2.5em;border-color:#999;background:#fff;line-height:2.5em}
#mb_nb img {display:none} #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_nb {clear:both;background:#ecf0f7;text-align:center}
#hd_nb li {display:inline-block}
#hd_nb li:nth-last-of-type(1) {border-right:0 !important}
#hd_nb a {display:inline-block;padding:10px 7px;text-decoration:none}
#lnb {} #lnb {}
#lnb ul {margin:0;padding:0;border-bottom:1px solid #e7f1ed;list-style:none} #lnb ul {margin:0;padding:0;border-bottom:1px solid #e7f1ed;list-style:none}

2
head.php
View File

@ -35,7 +35,7 @@ if ($config['cf_include_head']) {
<a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="처음으로"></a> <a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="처음으로"></a>
</div> </div>
<fieldset id="sch"> <fieldset id="hd_sch">
<legend>사이트 내 전체검색</legend> <legend>사이트 내 전체검색</legend>
<form name="fsearchbox" method="get" action="<?php echo G5_BBS_URL ?>/search.php" onsubmit="return fsearchbox_submit(this);"> <form name="fsearchbox" method="get" action="<?php echo G5_BBS_URL ?>/search.php" onsubmit="return fsearchbox_submit(this);">
<input type="hidden" name="sfl" value="wr_subject||wr_content"> <input type="hidden" name="sfl" value="wr_subject||wr_content">

32
mobile/head.php
View File

@ -22,16 +22,17 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
<a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="처음으로"></a> <a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="처음으로"></a>
</div> </div>
<fieldset id="sch"> <button type="button" id="hd_sch_open">검색<span class="sound_only"> 열기</span></button>
<legend>사이트 내 전체검색</legend>
<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"> <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="sfl" value="wr_subject||wr_content">
<input type="hidden" name="sop" value="and"> <input type="hidden" name="sop" value="and">
<input type="text" name="stx" id="sch_stx" placeholder="검색어(필수)" required class="frm_input required" maxlength="20">
<label for="sch_stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label> <input type="submit" value="검색" class="btn_submit">
<input type="text" name="stx" id="sch_stx" placeholder="검색어(필수)" required class="required" maxlength="20"> <button type="button" class="pop_close"><span class="sound_only">검색 </span>닫기</button>
<input type="image" alt="검색" src="<?php echo G5_IMG_URL ?>/btn_search.jpg" id="sch_submit" width="24" height="24">
</form> </form>
<script> <script>
@ -59,11 +60,24 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
} }
return true; return true;
} }
</script> </script>
</fieldset> </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="mb_nb"> <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 ?>/qalist.php" id="snb_new">1:1문의</a></li>
<li><a href="<?php echo G5_BBS_URL ?>/current_connect.php" id="snb_cnt">접속자 <?php echo connect(); // 현재 접속자수 ?></a></li> <li><a href="<?php echo G5_BBS_URL ?>/current_connect.php" id="snb_cnt">접속자 <?php echo connect(); // 현재 접속자수 ?></a></li>
<li><a href="<?php echo G5_BBS_URL ?>/new.php" id="snb_new">새글</a></li> <li><a href="<?php echo G5_BBS_URL ?>/new.php" id="snb_new">새글</a></li>