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}
/* 전체 검색 */
#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}
#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 {position:absolute;top:22px;left:170px;margin:0;padding:0;border:1px solid #c3c6ca}
#hd_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
#hd_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_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: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}
/* 상단 레이아웃 */
#hd {background:#fff}
#hd {position:relative;background:#fff}
#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: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}
#sch_stx {padding-left:3px;width:100px;height:24px;border:0;background:#fff;line-height:1.5em;-webkit-appearance:none}
#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}
#mb_nb {clear:both;background:#151515;text-align:center}
#mb_nb li {display:inline-block;border-right:1px solid #333}
#mb_nb li:nth-last-of-type(1) {border-right:0 !important}
#mb_nb a {display:inline-block;padding:10px 7px;color:#fff;text-decoration:none}
#mb_nb img {display:none}
#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_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 ul {margin:0;padding:0;border-bottom:1px solid #e7f1ed;list-style:none}