firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/g4s

Browse Source 
Conflicts:
	head.sub.php
This commit is contained in:
gnuboard
2013-01-14 13:16:34 +09:00
parent c0ecb1cdec 0ce3006c13
commit e8b23b29e9
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
adm/img/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
adm/img/logo_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 420 B

BIN
adm/img/top_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 146 B

0
adm.css → css/adm.css
View File

12
def.css → css/default.css
View File

@ -30,7 +30,7 @@ caption {padding:0 0 10px;text-align:left}
th {padding:12px 0 8px;border-top:3px solid #666;border-bottom:1px solid #a9a9a9;font-size:0.75em}
th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
td {padding:10px 0;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;font-size:0.75em}
.empty_table {padding:50px 0;text-align:center}
.empty_table {padding:85px 0;text-align:center}
/* 필드셋 */
fieldset {margin-bottom:20px;padding:13px;border:1px solid #dedace;background:#fefefe}
@ -117,7 +117,7 @@ a {color:#000;text-decoration:none}
#ol_submit {position:absolute;top:42px;right:12px;width:60px;height:24px;border:1px solid #b7b7b7;background:#fff;font-size:1em;font-weight:bold;letter-spacing:-0.1em;line-height:2em}
/* 아웃로그인 후 */
#ol_after {width:219px;color:#000;font-size:0.75em}
#ol_after_hd {padding:15px 0 13px;border-bottom:1px solid #efeada;text-align:center}
#ol_after_hd {padding:15px 0 13px;border-bottom:1px solid #ddd;text-align:center}
#ol_after_hd a {color:#ff3061}
#ol_after ul {margin:0;padding:0;zoom:1}
#ol_after ul:after {display:block;visibility:hidden;clear:both;content:""}
@ -125,11 +125,11 @@ a {color:#000;text-decoration:none}
#ol_after_rec {background:#fff}
#ol_after_rec a {display:inline-block;position:relative;width:60px;height:60px;vertical-align:top}
#ol_after_rec span {position:absolute;top:0;left:0;width:100%;height:100%;background:#fff}
#ol_after_rec strong {position:absolute;top:35px;left:0;width:100%;color:#777;text-align:center}
#ol_after_rec #ol_after_pt {width:97px;border-right:1px solid #efeada;border-left:1px solid #efeada}
#ol_after_ft {border-top:1px solid #efeada;text-align:center}
#ol_after_rec strong {position:absolute;top:35px;left:0;width:100%;text-align:center}
#ol_after_rec #ol_after_pt {width:97px;border-right:1px solid #ddd;border-left:1px solid #ddd}
#ol_after_ft {border-top:1px solid #ddd;text-align:center}
#ol_after_ft a {display:inline-block;padding:7px 0 !important;text-align:center}
#ol_after_info {width:109px;border-right:1px solid #efeada}
#ol_after_info {width:109px;border-right:1px solid #ddd}
#ol_after_logout {width:109px}
/* 설문조사 */

8
head.sub.php
View File

@ -48,11 +48,17 @@ header("Pragma: no-cache"); // HTTP/1.0
<head>
<meta charset="<?=$g4['charset']?>">
<title><?=$g4['title']?></title>
<meta http-equiv='X-UA-Compatible' content='IE=Edge' />
<!-- <meta http-equiv='X-UA-Compatible' content='IE=Edge' /> -->
<? if (isset($administrator)) { ?>
<<<<<<< HEAD
<link rel="stylesheet" href="<?=$g4['path']?>/adm.css?=<?=date("md")?>">
<? } else { ?>
<link rel="stylesheet" href="<?=$g4['path']?>/def.css?=<?=date("md")?>">
=======
<link rel="stylesheet" href="<?=$g4['url']?>/css/adm.css?=<?=date("md")?>">
<? } else { ?>
<link rel="stylesheet" href="<?=$g4['url']?>/css/default.css?=<?=date("md")?>">
>>>>>>> 0ce3006c134433544fcc652714d529d7c49c7f4b
<?}?>
<!--[if lte IE 8]>
<script src="<?=$g4['url']?>/js/html5.js"></script>