From 6a9c1f4579e6ffba02fb8dbb6658eb37a4d7354c Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 25 Jan 2013 13:33:34 +0900 Subject: [PATCH 01/12] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=ED=83=9C=EA=B7=B8=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EB=B6=80=EB=B6=84=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/neo/view.skin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skin/board/neo/view.skin.php b/skin/board/neo/view.skin.php index 6e8343b26..366fe16e5 100644 --- a/skin/board/neo/view.skin.php +++ b/skin/board/neo/view.skin.php @@ -26,8 +26,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 Date: Fri, 25 Jan 2013 13:44:58 +0900 Subject: [PATCH 02/12] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=ED=8C=90=EC=8A=A4=ED=82=A8=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC=20=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/css/default.css b/css/default.css index fed3e26a2..01eccc7a2 100644 --- a/css/default.css +++ b/css/default.css @@ -246,9 +246,10 @@ table a {color:#000;text-decoration:none} /* 게시판 읽기 */ #bo_v_title {} -#bo_v {position:relative;margin-bottom:30px;border-top:2px solid #666;border-right:1px solid #eee;border-bottom:1px solid #eee;background:#fff} -#bo_v_h1 {margin:0 0 10px !important;padding:15px 20px 0;font-size:1.2em} -#bo_v_info {padding:0 0 10px;border-bottom:1px solid #efeada} +#bo_v {position:relative;margin-bottom:30px;border-top:5px solid #666;border-right:1px solid #eee;border-bottom:1px solid #eee;background:#fff} +#bo_v a {color:#000;text-decoration:none} +#bo_v_h1 {padding:20px 20px 10px;font-size:1.2em} +#bo_v_info {padding:0 0 15px;border-bottom:1px solid #eee} #bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_info div {padding:0 20px} #bo_v_info strong {display:inline-block;margin:0 10px 0 5px;font-weight:normal} @@ -256,18 +257,18 @@ table a {color:#000;text-decoration:none} #bo_v_top:after {display:block;visibility:hidden;clear:both;content:""} #bo_v_top h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_top ul {padding:0 20px;list-style:none} -#bo_v_file {border-bottom:1px solid #eee;background:#fff} +#bo_v_file {border-left:5px solid #ccc} #bo_v_file h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_file ul {margin:0;padding:0;list-style:none} -#bo_v_file a {display:inline-block;padding:8px 20px 7px} -#bo_v_file strong {text-decoration:underline} -.bo_v_file_cnt {display:inline-block;margin:0 10px;color:#0075b8} -#bo_v_link {border-bottom:1px solid #eee;background:#fff} +#bo_v_file li {padding:0 20px 0 15px;border-bottom:1px solid #eee;background:#f7f7f2} +#bo_v_file a {display:inline-block;padding:8px 0 7px} +.bo_v_file_cnt {display:inline-block;margin:0 10px} +#bo_v_link {border-left:5px solid #ccc} #bo_v_link h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_link ul {margin:0;padding:0;list-style:none} -#bo_v_link a {display:inline-block;padding:8px 20px 7px} -#bo_v_link strong {text-decoration:underline} -.bo_v_link_cnt {display:inline-block;margin:0 10px;color:#0075b8} +#bo_v_link li {padding:0 20px 0 15px;border-bottom:1px solid #eee;background:#f7f7f2} +#bo_v_link a {display:inline-block;padding:8px 0 7px} +.bo_v_link_cnt {display:inline-block;margin:0 10px} #bo_v_atc {zoom:1} #bo_v_atc:after {display:block;visibility:hidden;clear:both;content:""} #bo_v_atc h1 {margin:0;padding:0;height:0;overflow:hidden} @@ -286,7 +287,7 @@ table a {color:#000;text-decoration:none} .bo_v_com li {float:left;margin-left:5px} /* 게시판 댓글 */ -#bo_vc {padding:10px 20px 20px;border-bottom:1px solid #eee;background:#fff} +#bo_vc {padding:10px 20px 20px 20px;border-bottom:1px solid #eee;border-left:10px solid #eee} #bo_vc h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_vc article {margin-bottom:5px;padding:0 0 10px;border-bottom:1px solid #f7f7f2} #bo_vc header {position:relative;zoom:1} @@ -294,7 +295,7 @@ table a {color:#000;text-decoration:none} #bo_vc header .icon_reply {position:absolute;top:15px;left:-20px} #bo_vc header span {} #bo_vc h1 {display:inline-block;margin:15px 0 5px} -#bo_vc h1 a {color:#000;text-decoration:none} +#bo_vc a {color:#000;text-decoration:none} #bo_vc p {padding:0 0 5px;line-height:1.8em} #bo_vc fieldset {margin:0 0 10px;padding:0} #bo_vc #bo_vc_winfo {float:left} From 2a2f5358a6947387e4918bd1caca98f48044e579 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 25 Jan 2013 13:46:43 +0900 Subject: [PATCH 03/12] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=95=84?= =?UTF-8?q?=EC=9B=83=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=ED=9B=84=20=EC=A3=BC=EC=9A=94=EC=88=AB=EC=9E=90?= =?UTF-8?q?=ED=91=9C=EC=8B=9C=20=EC=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index 01eccc7a2..a9e1a7aef 100644 --- a/css/default.css +++ b/css/default.css @@ -160,7 +160,7 @@ table a {color:#000;text-decoration:none} #ol_after_private:after {display:block;visibility:hidden;clear:both;content:""} #ol_after_private li {float:left} #ol_after_private a {display:block;padding-top:8px;height:37px;background:#f7f7f2;text-align:center} -#ol_after_private a strong {display:block;padding-top:5px;color:#ff4679} +#ol_after_private a strong {display:block;padding-top:5px;color:#0075b8} #ol_after_memo {width:50px;margin-right:1px} #ol_after_pt {width:90px;margin-right:1px} #ol_after_scrap {width:48px;line-height:2.6em !important} From ce16a578cb2953ce3444ab876c1fe7cf7b429759 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 25 Jan 2013 14:03:59 +0900 Subject: [PATCH 04/12] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=ED=8C=90=EC=8A=A4=ED=82=A8=20=EC=9D=BD=EA=B8=B0=20?= =?UTF-8?q?=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 9 +++++---- skin/board/neo/view.skin.php | 14 +++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/css/default.css b/css/default.css index a9e1a7aef..a7c8cab20 100644 --- a/css/default.css +++ b/css/default.css @@ -269,10 +269,11 @@ table a {color:#000;text-decoration:none} #bo_v_link li {padding:0 20px 0 15px;border-bottom:1px solid #eee;background:#f7f7f2} #bo_v_link a {display:inline-block;padding:8px 0 7px} .bo_v_link_cnt {display:inline-block;margin:0 10px} -#bo_v_atc {zoom:1} +#bo_v_atc {min-height:200px;height:auto !important;height:200px;zoom:1} #bo_v_atc:after {display:block;visibility:hidden;clear:both;content:""} #bo_v_atc h1 {margin:0;padding:0;height:0;overflow:hidden} -#bo_v_con {padding:20px;min-height:200px;height:auto !important;height:200px;background:#fff;line-height:1.8em} +#bo_v_img {margin:0 20px} +#bo_v_con {padding:20px;line-height:1.8em} #bo_v_act {padding:20px 0;border-bottom:1px solid #eee;text-align:center} #bo_v_act a {margin-right:5px;vertical-align:top} #bo_v_act strong {color:#0075b8} @@ -287,9 +288,9 @@ table a {color:#000;text-decoration:none} .bo_v_com li {float:left;margin-left:5px} /* 게시판 댓글 */ -#bo_vc {padding:10px 20px 20px 20px;border-bottom:1px solid #eee;border-left:10px solid #eee} +#bo_vc {padding:10px 20px 20px 20px;border-bottom:1px solid #eee;border-left:10px solid #eee;background:#f9f9f9} #bo_vc h2 {margin:0;padding:0;height:0;overflow:hidden} -#bo_vc article {margin-bottom:5px;padding:0 0 10px;border-bottom:1px solid #f7f7f2} +#bo_vc article {margin-bottom:5px;padding:0 0 10px;border-bottom:1px solid #eee} #bo_vc header {position:relative;zoom:1} #bo_vc header:after {display:block;visibility:hidden;clear:both;content:""} #bo_vc header .icon_reply {position:absolute;top:15px;left:-20px} diff --git a/skin/board/neo/view.skin.php b/skin/board/neo/view.skin.php index 366fe16e5..1ce4d867e 100644 --- a/skin/board/neo/view.skin.php +++ b/skin/board/neo/view.skin.php @@ -26,8 +26,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가

본문

-
+
// 이미지 등비율 리사이징 -$(document).ready(function(){ - var img = $('#bo_v_atc img'); +$(function(){ + var img = $('#bo_v_img img'); var img_org_width = img.width(); $(window).resize(function(){ - var wrapper_width = $('#bo_v_atc').width(); + var img_wrap = $('#bo_v_img').width(); img.each(function() { var img_width = $(this).width(); - if (img_width > wrapper_width) { + if (img_width > img_wrap) { $(this).addClass('img_fix'); - } else if (img_width <= wrapper_width && img_width >= img_org_width) { + } else if (img_width <= img_wrap && img_width >= img_org_width) { $(this).removeClass('img_fix'); } }); From 011daba1cbe895fad05419605275cda12c670e2a Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 25 Jan 2013 14:18:03 +0900 Subject: [PATCH 05/12] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=95=84?= =?UTF-8?q?=EC=9B=83=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=EC=A0=84=20=EB=B2=84=ED=8A=BC=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC,=20=EA=B8=B0=EB=B3=B8=EB=B2=84=ED=8A=BC=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/css/default.css b/css/default.css index a7c8cab20..bc5435c66 100644 --- a/css/default.css +++ b/css/default.css @@ -86,11 +86,11 @@ hr {display:none} .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 10px;height:28px;border:0;background:#0075b8;color:#fff;letter-spacing:-0.1em;vertical-align:top} -.btn_cancel {display:inline-block;padding:0 10px;height:26px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2.5em} +.btn_submit {padding:0 10px;height:24px;border:0;background:#484848;color:#fff;letter-spacing:-0.1em;vertical-align:top} +.btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2em} .btn_frmline {padding:0 7px 0 5px;height:22px;border:0;background:#0075b8;color:#fff;letter-spacing:-0.1em;vertical-align:top;line-height:2em} .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */ -.btn_win a {display:inline-block;padding:0 10px;height:28px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2.5em;cursor:pointer} +.btn_win a {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2em;cursor:pointer} /* ///// 기본테이블 ///// */ table {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0} @@ -147,7 +147,7 @@ table a {color:#000;text-decoration:none} .ol_pwlabel {position:absolute;top:35px;left:5px;color:#696969;font-size:0.9em} #auto_login {} #auto_login_label {letter-spacing:-0.1em} -#ol_submit {width:60px;height:24px;border:1px solid #d1d1d1;background:#f7f7f2;font-size:0.9em;font-weight:bold;vertical-align:top} +#ol_submit {width:60px;height:24px;border:1px solid #383838;background:#484848;color:#fff;font-size:0.9em;font-weight:bold;vertical-align:top} #ol_before ul {float:right;margin:7px 0 13px;zoom:1} #ol_before ul:after {display:block;visibility:hidden;clear:both;content:""} #ol_before li {float:left;margin-left:5px;padding-top:2px} @@ -273,8 +273,9 @@ table a {color:#000;text-decoration:none} #bo_v_atc:after {display:block;visibility:hidden;clear:both;content:""} #bo_v_atc h1 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_img {margin:0 20px} +/*#bo_v_img img {max-width:100%;height:auto}*/ #bo_v_con {padding:20px;line-height:1.8em} -#bo_v_act {padding:20px 0;border-bottom:1px solid #eee;text-align:center} +#bo_v_act {padding:20px 0;text-align:center} #bo_v_act a {margin-right:5px;vertical-align:top} #bo_v_act strong {color:#0075b8} #bo_v form {padding-top:20px} From 6ad929a65bfdf940f99ce0e2d81529aa5671d75c Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 25 Jan 2013 14:30:45 +0900 Subject: [PATCH 06/12] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=EB=A9=94=EB=89=B4=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.menu400.shop_1of2.php | 10 +++++----- adm/admin.menu500.shop_2of2.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/adm/admin.menu400.shop_1of2.php b/adm/admin.menu400.shop_1of2.php index 84243bbcc..a5c2243d9 100644 --- a/adm/admin.menu400.shop_1of2.php +++ b/adm/admin.menu400.shop_1of2.php @@ -1,29 +1,29 @@ \ No newline at end of file diff --git a/adm/admin.menu500.shop_2of2.php b/adm/admin.menu500.shop_2of2.php index 9b05b5d8a..70939b431 100644 --- a/adm/admin.menu500.shop_2of2.php +++ b/adm/admin.menu500.shop_2of2.php @@ -1,12 +1,12 @@ Date: Fri, 25 Jan 2013 14:51:28 +0900 Subject: [PATCH 07/12] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20ckeditor=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/contentform.php | 19 ++++++++----------- adm/shop_admin/faqform.php | 24 ++++++++++-------------- adm/shop_admin/faqmasterform.php | 32 ++++++++++++++------------------ adm/shop_admin/itemeventform.php | 28 ++++++++++++---------------- adm/shop_admin/itemform.php | 19 +++++++------------ adm/shop_admin/itempsform.php | 14 ++++++-------- adm/shop_admin/newwinform.php | 21 +++++++++------------ 7 files changed, 66 insertions(+), 91 deletions(-) diff --git a/adm/shop_admin/contentform.php b/adm/shop_admin/contentform.php index 40a57026e..94136ceac 100644 --- a/adm/shop_admin/contentform.php +++ b/adm/shop_admin/contentform.php @@ -1,7 +1,7 @@

- - - @@ -59,7 +56,7 @@ include_once ("$g4[admin_path]/admin.head.php"); - + @@ -110,12 +107,12 @@ include_once ("$g4[admin_path]/admin.head.php"); - - - @@ -53,20 +49,20 @@ include_once ("$g4[admin_path]/admin.head.php"); - @@ -78,7 +74,7 @@ include_once ("$g4[admin_path]/admin.head.php"); - - - @@ -41,12 +37,12 @@ include_once ("$g4[admin_path]/admin.head.php"); @@ -82,11 +78,11 @@ include_once ("$g4[admin_path]/admin.head.php"); - + - +
내용
상단 파일 경로
질문 + 질문 - +
답변 - +
제목 - 상세보기"; - } + } ?>
상단 내용
하단 내용
@@ -97,10 +93,10 @@ include_once ("$g4[admin_path]/admin.head.php"); - - -

@@ -54,10 +50,10 @@ include_once ("$g4[admin_path]/admin.head.php"); 이벤트번호 - @@ -100,7 +96,7 @@ include_once ("$g4[admin_path]/admin.head.php"); 사용 @@ -164,11 +160,11 @@ include_once ("$g4[admin_path]/admin.head.php"); 상단 내용 - + 하단 내용 - + @@ -180,10 +176,10 @@ include_once ("$g4[admin_path]/admin.head.php"); - - - -