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

Conflicts:
	skin/poll/neo/poll.skin.php

css/default.css

@@ -15,6 +15,10 @@ hr {display:none}
 
 /* 웹접근성 스킬 */
 .sound_only {display:inline-block;margin:0;padding:0;width:0;height:0;border:0;overflow:hidden}
+/* 본문 바로가기 */
+#to_content a {z-index:100000000;display:block;position:absolute;top:0;left:0;height:0;overflow:hidden}
+#to_content a:focus,
+#to_content a:active {padding:10px 0;width:100%;height:auto;background:#333;color:#fff;text-align:center;overflow:auto}
 
 /* 자동등록방지 */
 .captcha {display:inline-block;vertical-align:middle}
@@ -57,11 +61,6 @@ fieldset button:focus,
 #install_done div {position:relative;margin:0 auto;width:700px;background:#000}
 #install_done div span {position:absolute;top:-28px;left:0;width:700px;height:580px;background:url("../img/install_done.jpg")}
 
-/* 내용 건너뛰기 */
-#to_content a {display:block;position:absolute;top:0;left:0;height:0;overflow:hidden}
-#to_content a:focus,
-#to_content a:active {padding:10px 0;width:100%;height:auto;background:#333;color:#fff;text-align:center;overflow:auto}
-
 /* 헤딩 */
 h1 {margin:0 0 20px;font-size:1.6em}
 h2, h3, h4, h5, h6 {margin:0 0 20px}
@@ -74,14 +73,14 @@ a {color:#000;text-decoration:none}
 #header h1 {margin:0;height:0;overflow:hidden}
 
 /* 로고 */
-#logo {border-bottom:3px solid #666;background:url('../img/logo_bg.jpg') #333 top center repeat-x;text-align:center}
-#logo a {display:inline-block;padding:55px 30px 20px}
+#logo {padding-top:35px;border-bottom:3px solid #666;background:url('../img/logo_bg.jpg') #333 top center repeat-x;text-align:center}
+#logo a {display:inline-block;padding:20px 30px 20px}
 
 /* 상단메뉴 */
 #tnb {position:absolute;top:0;left:0;width:100%;border-bottom:1px solid #000;background:url('../img/tnb_bg.jpg') #fff bottom left repeat-x;zoom:1}
 #tnb:after {display:block;visibility:hidden;clear:both;content:""}
 #tnb li {float:left}
-#tnb a {display:inline-block;padding:0 10px;height:30px;border-right:1px solid #bbb;font-family:"dotum";font-size:0.7em;text-decoration:none;line-height:2.7em}
+#tnb a {display:inline-block;padding:0 10px;height:30px;border-right:1px solid #ccc;font-family:"dotum";font-size:0.7em;text-decoration:none;line-height:2.7em}
 
 /* 전체검색 */
 #hdsch {z-index:3;position:absolute;top:0;right:0;margin:0;padding:0;width:220px;border:0;border-left:1px solid #bbb;background:url('../img/search_bg.jpg') #fff bottom left repeat-x}
@@ -122,12 +121,17 @@ a {color:#000;text-decoration:none}
 #ol_after li {float:left}
 #ol_after_rec {background:#fff}
 #ol_after_rec a {display:inline-block;position:relative;width:60px;height:50px;font-size:0.9em;vertical-align:top}
-#ol_after_rec span {position:absolute;top:0;left:0;width:100%;height:100%}
-#ol_after_rec strong {position:absolute;top:32px;left:0;width:100%;font-weight:normal;text-align:center}
+#ol_after_rec span {position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;line-height:7em}
 #ol_after_rec #ol_after_pt {width:97px;border-right:1px solid #ddd;border-left:1px solid #ddd}
-#ol_after_memo_img {background:url('../img/ol_after_bg.jpg')}
-#ol_after_pt_img {background:url('../img/ol_after_bg.jpg') -61px 0}
-#ol_after_scrap_img {background:url('../img/ol_after_bg.jpg') -159px 0}
+#ol_after_memo span {background:url('../img/ol_after_bg.jpg')}
+#ol_after_memo:focus span,
+#ol_after_memo:hover span {background-position:0 -50px}
+#ol_after_pt span {background:url('../img/ol_after_bg.jpg') -61px 0}
+#ol_after_pt:focus span,
+#ol_after_pt:hover span {background-position:-61px -50px}
+#ol_after_scrap span {background:url('../img/ol_after_bg.jpg') -159px 0}
+#ol_after_scrap:focus span,
+#ol_after_scrap:hover span {background-position:-159px -50px}
 #ol_after_ft {background:#f0f0f0;text-align:center}
 #ol_after_ft a {display:inline-block;padding:9px 0 8px !important;width:109px;text-align:center}
 

skin/outlogin/neo/outlogin.skin.2.php

@@ -10,9 +10,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
         <? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=$g4['admin_path']?>/" id="ol_admin">관리자</a><? } ?>
     </header>
     <ul id="ol_after_rec">
-        <li><a href="<?=$g4['path']?>/bbs/memo.php" id="ol_after_memo" target="_blank"><span id="ol_after_memo_img"></span>안 읽은 쪽지 <strong><?=$memo_not_read?></strong></a></li>
-        <li><a href="<?=$g4['path']?>/bbs/point.php" id="ol_after_pt" target="_blank"><span id="ol_after_pt_img"></span>포인트 <strong><?=$point?></strong></a></li>
-        <li><a href="<?=$g4['path']?>/bbs/scrap.php" id="ol_after_scrap" target="_blank"><span id="ol_after_scrap_img"></span><strong>스크랩</strong></a></li>
+        <li><a href="<?=$g4['path']?>/bbs/memo.php" id="ol_after_memo" target="_blank">안 읽은 쪽지 <span id="ol_after_memo_img"><?=$memo_not_read?></span></a></li>
+        <li><a href="<?=$g4['path']?>/bbs/point.php" id="ol_after_pt" target="_blank">포인트 <span id="ol_after_pt_img"><?=$point?></span></a></li>
+        <li><a href="<?=$g4['path']?>/bbs/scrap.php" id="ol_after_scrap" target="_blank"><span id="ol_after_scrap_img">스크랩</span></a></li>
     </ul>
     <footer id="ol_after_ft">
         <ul>

skin/poll/neo/poll.skin.php

@@ -19,7 +19,11 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
 <section id="poll">
     <header>
         <h2>설문조사</h2>
+<<<<<<< HEAD
         <? if ($is_admin == "super") { ?><a href="<?=$g4['admin_url']?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>
+=======
+        <? if ($is_admin == "super") { ?><a href="<?=$g4[admin_path]?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문관리</a><? } ?>
+>>>>>>> 8acf7f8c214b606db9e4d7b3533a916ca4171b83
         <p><?=$po['po_subject']?></p>
     </header>
     <ul>