From 029aaa4aafd4b81eb82442f2aec3ede61c021a12 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Fri, 18 Jan 2013 16:09:42 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=AA=BD?=
 =?UTF-8?q?=EC=A7=80=EC=9D=BD=EA=B8=B0=EC=8A=A4=ED=82=A8=20=EB=8B=B5?=
 =?UTF-8?q?=EC=9E=A5=20=EB=B2=84=ED=8A=BC=20=EC=83=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/memo_view.php                  | 4 +---
 css/default.css                    | 6 +++---
 skin/member/neo/memo_view.skin.php | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/bbs/memo_view.php b/bbs/memo_view.php
index cb1c41e98..2d328c036 100644
--- a/bbs/memo_view.php
+++ b/bbs/memo_view.php
@@ -65,10 +65,8 @@ $mb = get_member($memo['me_'.$unkind.'_mb_id']);
 
 echo '<script src="'.$g4['path'].'/js/sideview.js"></script>';
 
-<<<<<<< HEAD
-=======
 $member_skin_path = $g4['path'].'/skin/member/'.$config['cf_member_skin'];
->>>>>>> fca2c7be504cccbd5466136a893f3d3ed875554c
+
 include_once($member_skin_path.'/memo_view.skin.php');
 
 include_once($g4['path'].'/tail.sub.php');
diff --git a/css/default.css b/css/default.css
index 40386acbd..65f47cb78 100644
--- a/css/default.css
+++ b/css/default.css
@@ -215,9 +215,9 @@ a {color:#000;text-decoration:none}
 .highlight {font-weight:bold;color:#ff4679}
 
 /* 버튼 */
-.btn01 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ff5e1c;background:#ff4679;color:#fff;text-decoration:none;line-height:2.2em}
-.btn02 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2.2em}
-.btn03 {display:inline-block;padding:0 10px;height:24px;border:1px solid #494949;background:#494949;color:#fff;text-decoration:none;line-height:2.2em}
+.btn01 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ff5e1c !important;background:#ff4679 !important;color:#fff !important;text-decoration:none;line-height:2.2em}
+.btn02 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none;line-height:2.2em}
+.btn03 {display:inline-block;padding:0 10px;height:24px;border:1px solid #494949 !important;background:#494949 !important;color:#fff !important;text-decoration:none;line-height:2.2em}
 .btn_confirm {text-align:center} /* 서식단계 진행 */
 .btn_submit {padding:0 15px;height:30px;border:0;background:#ff4679;color:#fff;letter-spacing:-0.1em;vertical-align:top}
 .btn_cancel {display:inline-block;padding:0 10px;height:28px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2.5em}
diff --git a/skin/member/neo/memo_view.skin.php b/skin/member/neo/memo_view.skin.php
index 256f79666..a7dbc0732 100644
--- a/skin/member/neo/memo_view.skin.php
+++ b/skin/member/neo/memo_view.skin.php
@@ -31,7 +31,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
         <? if($next_link) { ?>
         <a href="<?=$next_link?>">다음쪽지</a>
         <? } ?>
-        <? if ($kind == 'recv') { ?><a href="./memo_form.php?me_recv_mb_id=<?=$mb['mb_id']?>&amp;me_id=<?=$memo['me_id']?>">답장</a><? } ?>
+        <? if ($kind == 'recv') { ?><a href="./memo_form.php?me_recv_mb_id=<?=$mb['mb_id']?>&amp;me_id=<?=$memo['me_id']?>" class="btn01">답장</a><? } ?>
         <a href="./memo.php?kind=<?=$kind?>">목록보기</a>
     </div>
 </div>