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

This commit is contained in:
chicpro
2013-01-28 13:52:16 +09:00
6 changed files with 12 additions and 10 deletions

View File

@ -51,6 +51,8 @@ pre {overflow-x:scroll;font-size:1.1em}
#container {float:left;width:730px;zoom:1}
#container:after {display:block;visibility:hidden;clear:both;content:""}
.cbg {border-right:1px solid #ddd;border-bottom:1px solid #ddd;background:#fff}
/* 하단 레이아웃 */
#ft {background:#484848}
#ft h1 {width:0;height:0;overflow:hidden}
@ -146,7 +148,7 @@ table a {color:#000;text-decoration:none}
/* ///// 스킨별 스타일 ///// */
/* 아웃로그인 스킨 */
.ol {position:relative;margin-bottom:10px;padding:14px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background:#fff}
.ol {position:relative;margin-bottom:10px;padding:14px}
.ol h2 {width:0;height:0;overflow:hidden}
.ol ul {margin:0;padding:0;list-style:none}
.ol a {color:#000;text-decoration:none}
@ -179,19 +181,19 @@ table a {color:#000;text-decoration:none}
#ol_after_ft a {display:inline-block;margin-left:5px}
/* 설문조사 스킨 */
#poll {border-right:1px solid #ddd;border-bottom:1px solid #ddd;background:#fff}
#poll {}
#poll header {padding:14px 14px 0}
#poll ul {margin:0 0 10px;padding:5px 14px;background:#f7f7f2;list-style:none}
#poll li {padding:3px 0}
#poll footer {padding:0 14px 14px;text-align:right}
/* 최근게시물 스킨 (latest) */
.lt {float:left;margin-bottom:20px;padding:20px;width:314px;height:149px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background:#fff}
.lt {float:left;margin-bottom:20px;padding:20px;width:314px;height:149px}
.lt ul {margin:0;padding:0;list-style:none}
.lt li {padding:3px 0}
.lt a {color:#000;text-decoration:none}
.lt_title {display:block;margin-bottom:20px;text-align:center}
.lt_more {text-align:center}
.lt_more {text-align:right}
.lt_more a {display:block}
/* 최근게시물 스킨 (new) */
@ -258,7 +260,7 @@ table a {color:#000;text-decoration:none}
/* 게시판 읽기 */
#bo_v_title {}
#bo_v {position:relative;margin-bottom:30px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background:#fff}
#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}

View File

@ -4,7 +4,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<p id="bo_v_title"><strong><?=$board['bo_subject']?></strong></p>
<div id="bo_v">
<div id="bo_v" class="cbg">
<h1 id="bo_v_h1"><? if ($is_category) { ?> <?=($category_name ? "{$view['ca_name']} " : "");?><? } ?><?=cut_hangul_last(get_text($view['wr_subject']))?></h1>
<section id="bo_v_info">

View File

@ -2,7 +2,7 @@
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
?>
<div class="lt">
<div class="lt cbg">
<strong class="lt_title"><a href="<?=G4_BBS_URL?>/board.php?bo_table=<?=$bo_table?>"><?=$bo_subject?></a></strong>
<ul>
<? for ($i=0; $i<count($list); $i++) { ?>

View File

@ -2,7 +2,7 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<section id="ol_before" class="ol">
<section id="ol_before" class="ol cbg">
<h2>멤버쉽</h2>
<!-- 로그인 전 외부로그인 시작 -->
<form name="foutlogin" method="post" action="<?=$outlogin_action_url?>" onsubmit="return fhead_submit(this);" autocomplete="off">

View File

@ -3,7 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<!-- 로그인 후 외부로그인 시작 -->
<section id="ol_after" class="ol">
<section id="ol_after" class="ol cbg">
<header id="ol_after_hd">
<h2>나의 이용정보</h2>
<strong><?=$nick?></strong>님

View File

@ -16,7 +16,7 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
<form name="fpoll" method="post" action="<?=G4_BBS_URL?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="win_poll">
<input type="hidden" name="po_id" value="<?=$po_id?>">
<input type="hidden" name="skin_dir" value="<?=$skin_dir?>">
<section id="poll">
<section id="poll" class="cbg">
<header>
<h2>설문조사</h2>
<? if ($is_admin == "super") { ?><a href="<?=G4_ADM_URL?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>