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

This commit is contained in:
gnuboard
2013-01-28 14:22:00 +09:00
5 changed files with 26 additions and 14 deletions

View File

@ -239,7 +239,7 @@ table a {color:#000;text-decoration:none}
#bo_w caption {padding:0;height:0;overflow:hidden}
/* 게시판 목록 */
.btn_bo_adm input {padding:0 10px;height:26px;border:1px solid #ddd;background:#eee;color:#000;text-decoration:none}
.btn_bo_adm input {padding:0 10px;height:26px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none}
.bo_fx {margin-bottom:5px;zoom:1}
.bo_fx:after {display:block;visibility:hidden;clear:both;content:""}
.bo_fx ul {margin:0;padding:0;list-style:none}
@ -263,9 +263,9 @@ table a {color:#000;text-decoration:none}
#bo_v {position:relative;margin-bottom:30px}
#bo_v a {color:#000;text-decoration:none}
#bo_v_h1 {padding:30px 20px 10px;font-size:1.2em;line-height:1.4em}
#bo_v_info {padding:0 20px 15px}
#bo_v_info {padding:0 20px 15px;border-bottom:1px solid #f0f0f0}
#bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_info strong {display:inline-block;margin:0 10px 0 5px;font-weight:normal}
#bo_v_info strong {display:inline-block;margin:0 15px 0 5px;font-weight:normal}
#bo_v_top {zoom:1}
#bo_v_top:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_top h2 {margin:0;padding:0;height:0;overflow:hidden}
@ -314,6 +314,7 @@ table a {color:#000;text-decoration:none}
#bo_vc h1 {display:inline-block;margin:15px 10px 5px 0}
#bo_vc a {color:#000;text-decoration:none}
#bo_vc p {padding:0 0 5px;line-height:1.8em}
#bo_vc p a {text-decoration:underline}
#bo_vc fieldset {margin:0 0 10px;padding:0}
#bo_vc_w {zoom:1}
#bo_vc_w:after {display:block;visibility:hidden;clear:both;content:""}

14
css/mobile.css Normal file
View File

@ -0,0 +1,14 @@
/* SIR SOFT 지운아빠 Jan 2013 */
/* 초기화 */
html {overflow-y:scroll}
body {margin:0;padding:0;background:#f7f7f2;font-size:1em;font-family:"dotum"}
html, body, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0}
h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:"dotum"}
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}
header ul, nav ul, footer ul {margin:0;padding:0;list-style:none}
label, input, select, img {vertical-align:middle}
input {margin:0;padding:0;font-family:"dotum"}
p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all}
hr {display:none}
pre {overflow-x:scroll;font-size:1.1em}

View File

@ -14,7 +14,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
<header id="hd">
<div id="hd_wrapper">
<div id="to_content"><a href="#wrapper">본문 바로가기</a></div>
<div id="to_content"><a href="#container">본문 바로가기</a></div>
<div id="logo"><a href="<?=G4_URL?>"><img src="<?=G4_IMG_URL?>/logo.jpg" alt="처음으로"></a></div>
<h1><?=$config['cf_title']?></h1>

View File

@ -7,7 +7,6 @@ $begin_time = get_microtime();
if (!isset($g4['title']))
$g4['title'] = $config['cf_title'];
// 현재 접속자
//$lo_location = get_text($g4[title]);
//$lo_location = $g4[title];
@ -25,17 +24,22 @@ header("Cache-Control: no-cache"); // HTTP/1.1
header("Expires: 0"); // rfc2616 - Section 14.21
header("Pragma: no-cache"); // HTTP/1.0
*/
$g4_css = "";
if (G4_IS_MOBILE) $g4_css = "mobile";
else $g4_css = "default";
?>
<!doctype html>
<html lang="ko">
<head>
<meta charset="utf-8">
<? if (G4_IS_MOBILE) {?><meta name="viewport" content="user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, width=device-width" /><? } ?>
<!-- <meta http-equiv="X-UA-Compatible" content="IE=Edge" /> -->
<title><?=$g4['title']?></title>
<? if (isset($administrator)) { ?>
<link rel="stylesheet" href="<?=G4_CSS_URL?>/adm.css?=<?=date("md")?>">
<? } else { ?>
<link rel="stylesheet" href="<?=G4_CSS_URL?>/default.css?=<?=date("md")?>">
<link rel="stylesheet" href="<?=G4_CSS_URL?>/<?=$g4_css?>.css?=<?=date("md")?>">
<?}?>
<!--[if lte IE 8]>
<script src="<?=$g4['url']?>/js/html5.js"></script>

View File

@ -9,14 +9,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<section id="bo_v_info">
<h2>게시물 정보</h2>
작성자
<?=$view['name']?><? if ($is_ip_view) { echo "&nbsp;($ip)"; } ?>
<span class="sound_only">작성일</span>
<?=date("y-m-d H:i", strtotime($view['wr_datetime']))?>
조회
<?=number_format($view['wr_hit'])?>회
댓글
<?=number_format($view['wr_comment'])?>건
작성자 <strong><?=$view['name']?><? if ($is_ip_view) { echo "&nbsp;($ip)"; } ?></strong><span class="sound_only">작성일</span><strong><?=date("y-m-d H:i", strtotime($view['wr_datetime']))?></strong>조회<strong><?=number_format($view['wr_hit'])?>회</strong>댓글<strong><?=number_format($view['wr_comment'])?>건</strong>
</section>
<?