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-09-04 09:19:54 +09:00
parent 0d16cefbd0 305a5d7db9
commit 2288c87a9b
29 changed files with 336 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
adm/admin.head.php
View File

@ -70,7 +70,7 @@ function imageview(id, w, h)
<div id="hd_wrap">
<h1><?php echo $config['cf_title'] ?></h1>
<div id="logo"><a href="<?php echo G4_ADMIN_URL ?>"><img src="<?php echo G4_ADMIN_URL ?>/img/logo.jpg" alt="<?php echo $config['cf_title'] ?> 관리자 처음으로"></a></div>
<div id="logo"><a href="<?php echo G4_ADMIN_URL ?>"><img src="<?php echo G4_ADMIN_URL ?>/img/logo.jpg" alt="<?php echo $config['cf_title'] ?> 관리자"></a></div>
<ul id="tnb">
<li><a href="<?php echo G4_ADMIN_URL ?>/member_form.php?w=u&amp;mb_id=<?php echo $member['mb_id'] ?>">관리자정보</a></li>
@ -114,7 +114,6 @@ function imageview(id, w, h)
</header>
<div id="wrapper">
<div id="container">
<div id="text_size">
<button class="no_text_resize" onclick="font_resize('container', 'default');">기본</button>