From 65d12037060003d7f0186af9b505fb1d535f63dd Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 25 Feb 2013 15:03:18 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20lnb,=20conta?= =?UTF-8?q?iner=20=ED=85=8C=EB=91=90=EB=A6=AC=20=EC=83=89=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/default.css b/css/default.css index 1d60fbb3f..527bb8223 100644 --- a/css/default.css +++ b/css/default.css @@ -90,9 +90,9 @@ a:active {color:#000;text-decoration:underline} #wrapper:after {display:block;visibility:hidden;clear:both;content:""} #wrapper_title {margin-bottom:20px;font-size:1.2em} -#lnb {float:right;width:209px;border:1px solid #e7f1ed;background:#fff} +#lnb {float:right;width:209px;border:1px solid #d5d9d7;background:#fff} -#container {position:relative;float:left;padding:25px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #e7f1ed;background:#fff;zoom:1} +#container {position:relative;float:left;padding:25px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #d5d9d7;background:#fff;zoom:1} #container:after {display:block;visibility:hidden;clear:both;content:""} /* 하단 레이아웃 */ From 186bf3b5ea5b69507cbdc75568b489f15c5c9e02 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 25 Feb 2013 16:02:56 +0900 Subject: [PATCH 2/8] ? --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index 527bb8223..667788ab3 100644 --- a/css/default.css +++ b/css/default.css @@ -74,7 +74,7 @@ a:active {color:#000;text-decoration:underline} /* gnb js on */ .gnb_js {border-bottom:1px solid #c3c7c5;background:#fff} .gnb_js .gnb_1depth {position:relative;float:left;margin-left:-1px} -.gnb_js .gnb_1depth a {display:block;padding:0 15px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;letter-spacing:-0.1em;line-height:2.1em} +.gnb_js .gnb_1depth a {display:inline-block;padding:0 15px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;letter-spacing:-0.1em;line-height:2.1em} .gnb_js .gnb_1depth a:focus, .gnb_js .gnb_1depth a:hover, .gnb_js .gnb_1depth a:active {text-decoration:none} From 6f35c1e4a2adfe6b3fcad3a2b1b15405ce0c0b1c Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 25 Feb 2013 16:08:42 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EC=97=85=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EA=B2=BD=EB=A1=9C=20=EB=A9=94=EC=84=B8=EC=A7=80=20?= =?UTF-8?q?#308=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/write_update.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bbs/write_update.php b/bbs/write_update.php index f15953699..330bde8d1 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -204,11 +204,11 @@ for ($i=0; $i $board['bo_upload_size']) { - $file_upload_msg .= '"'.$filename.'" 파일의 용량('.number_format($filesize).' 바이트)이 게시판에 설정('.number_format($board['bo_upload_size']).' 바이트)된 값보다 크므로 업로드 하지 않습니다.'.PHP_EOL; + $file_upload_msg .= '\"'.$filename.'\" 파일의 용량('.number_format($filesize).' 바이트)이 게시판에 설정('.number_format($board['bo_upload_size']).' 바이트)된 값보다 크므로 업로드 하지 않습니다.\\n'; continue; } From ea5dfe32ea3d1478b86ce486b9a04969f088d36a Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 25 Feb 2013 16:09:38 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EA=B0=80=EC=9E=85=EC=95=BD=EA=B4=80=20#307=20?= =?UTF-8?q?=EC=9D=98=20=EC=9D=98=EA=B2=AC1=EC=97=90=20=EB=94=B0=EB=A5=B8?= =?UTF-8?q?=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/member/basic/register.skin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/skin/member/basic/register.skin.php b/skin/member/basic/register.skin.php index f6302728e..e4378fb91 100644 --- a/skin/member/basic/register.skin.php +++ b/skin/member/basic/register.skin.php @@ -4,6 +4,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+

회원가입약관 및 개인정보수집이용안내의 내용에 동의하셔야 회원가입 하실 수 있습니다.

+

회원가입약관

@@ -23,7 +25,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-

회원가입약관 및 개인정보수집이용안내의 내용에 동의하셔야 회원가입 하실 수 있습니다.

From 014109af4edc9e4ef073538760d21b8e79621194 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 25 Feb 2013 16:48:27 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb=20SF=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 --- css/admin.css | 1 + css/default.css | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/css/admin.css b/css/admin.css index 05e0e6d93..08c2a61de 100644 --- a/css/admin.css +++ b/css/admin.css @@ -48,6 +48,7 @@ h2 {font-size:1.2em} /* gnb js off */ #gnb {} + #gnb ul {z-index:10} .gnb_1depth {position:relative;margin-left:-1px;background:#383a3f;zoom:1} .gnb_1depth:after {display:block;visibility:hidden;clear:both;content:""} diff --git a/css/default.css b/css/default.css index 667788ab3..ee6a43b12 100644 --- a/css/default.css +++ b/css/default.css @@ -56,8 +56,7 @@ a:active {color:#000;text-decoration:underline} /* gnb js off */ #gnb {background:#f0f4f8} #gnb h2 {margin:0;padding:0;width:0;height:0;overflow:hidden} -#gnb ul {z-index:10;margin:0 auto;padding:0;width:980px;zoom:1} -#gnb ul:after {display:block;visibility:hidden;clear:both;content:""} +#gnb ul {z-index:10;margin:0 auto;padding:0;width:980px} .gnb_1depth {position:relative;margin-left:-1px;zoom:1} .gnb_1depth:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1depth a {display:inline-block;float:left;height:35px;color:#fff;line-height:2.7em !important;line-height:2.4em} @@ -66,20 +65,22 @@ a:active {color:#000;text-decoration:underline} .gnb_1depth a:focus, .gnb_1depth a:hover, .gnb_1depth a:active {text-decoration:none} -.gnb_1depth ul {float:left !important;margin:0 !important;padding:0 !important;width:auto !important;zoom:1} +.gnb_1depth ul {float:left;zoom:1} .gnb_1depth ul:after {display:inline-block;visibility:hidden;clear:both;content:""} .gnb_1depth li {float:left} .gnb_1depth_over ul {top:35px;left:-1px;width:auto;height:auto;border:1px solid #ccc;border-top:0} .gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:5px;width:auto;height:25px;border-bottom:0;color:#fff;font-weight:normal;text-align:left;line-height:2.1em !important;line-height:1.8em} /* gnb js on */ .gnb_js {border-bottom:1px solid #c3c7c5;background:#fff} -.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-1px} -.gnb_js .gnb_1depth a {display:inline-block;padding:0 15px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;letter-spacing:-0.1em;line-height:2.1em} +.gnb_js ul {zoom:1} +.gnb_js ul:after {display:block;visibility:hidden;clear:both;content:""} +.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-1px;width:80px} +.gnb_js .gnb_1depth a {display:inline-block;float:none;width:78px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;text-align:center;letter-spacing:-0.1em;line-height:2.1em} +.gnb_js .gnb_1depth_air a {float:none;background:#f7f7f2;color:#000} +.gnb_js .gnb_1depth_on a {float:none;background:#fff;color:#000} .gnb_js .gnb_1depth a:focus, .gnb_js .gnb_1depth a:hover, .gnb_js .gnb_1depth a:active {text-decoration:none} -.gnb_js .gnb_1depth_air a {float:none;background:#f7f7f2;color:#000} -.gnb_js .gnb_1depth_on a {float:none;background:#fff;color:#000} .gnb_js .gnb_1depth ul {width:0 !important;height:0 !important;overflow:hidden} .gnb_js .gnb_1depth li {float:none} .gnb_js .gnb_1depth_over ul {position:absolute;top:35px;left:0;width:181px !important;height:auto !important;border:1px solid #c3c7c5;border-top:0} From e1b5c5770ed828c22196c7f3e52578352823e5f8 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 25 Feb 2013 17:05:13 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb=20?= =?UTF-8?q?=EA=B0=80=EB=B3=80=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/css/default.css b/css/default.css index ee6a43b12..3182ca788 100644 --- a/css/default.css +++ b/css/default.css @@ -74,14 +74,14 @@ a:active {color:#000;text-decoration:underline} .gnb_js {border-bottom:1px solid #c3c7c5;background:#fff} .gnb_js ul {zoom:1} .gnb_js ul:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-1px;width:80px} -.gnb_js .gnb_1depth a {display:inline-block;float:none;width:78px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;text-align:center;letter-spacing:-0.1em;line-height:2.1em} +.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-2px} +.gnb_js .gnb_1depth a {display:inline-block;float:none;padding:0 15px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;text-align:center;letter-spacing:-0.1em;line-height:2.1em} .gnb_js .gnb_1depth_air a {float:none;background:#f7f7f2;color:#000} .gnb_js .gnb_1depth_on a {float:none;background:#fff;color:#000} .gnb_js .gnb_1depth a:focus, .gnb_js .gnb_1depth a:hover, .gnb_js .gnb_1depth a:active {text-decoration:none} -.gnb_js .gnb_1depth ul {width:0 !important;height:0 !important;overflow:hidden} +.gnb_js .gnb_1depth ul {width:1px !important;height:0 !important;overflow:hidden} .gnb_js .gnb_1depth li {float:none} .gnb_js .gnb_1depth_over ul {position:absolute;top:35px;left:0;width:181px !important;height:auto !important;border:1px solid #c3c7c5;border-top:0} .gnb_js .gnb_2depth a {display:inline-block;margin:0;padding:5px 10px;width:161px;height:25px;border:0;background:#fff;color:#000;font-weight:normal;text-align:left;line-height:2.1em} From 44fba87267503db8541f145020fba23fcbc8b572 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 25 Feb 2013 17:15:43 +0900 Subject: [PATCH 7/8] =?UTF-8?q?gnb=20=EC=88=98=EC=A0=95=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 4 ++-- css/default.css | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/css/admin.css b/css/admin.css index 08c2a61de..fc9f05dbb 100644 --- a/css/admin.css +++ b/css/admin.css @@ -52,14 +52,14 @@ h2 {font-size:1.2em} #gnb ul {z-index:10} .gnb_1depth {position:relative;margin-left:-1px;background:#383a3f;zoom:1} .gnb_1depth:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_1depth a {display:inline-block;float:left;width:90px;height:35px;color:#e0e0e0;font-weight:bold;line-height:2.95em !important;line-height:2.65em} +.gnb_1depth a {display:block;float:left;width:90px;height:35px;color:#e0e0e0;font-weight:bold;line-height:2.95em !important;line-height:2.65em} .gnb_1depth_air a, .gnb_1depth_on a {color:#000} .gnb_1depth a:focus, .gnb_1depth a:hover, .gnb_1depth a:active {text-decoration:none} .gnb_1depth ul {float:left;zoom:1} -.gnb_1depth ul:after {display:inline-block;visibility:hidden;clear:both;content:""} +.gnb_1depth ul:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1depth li {float:left} .gnb_1depth_over ul {top:35px;left:-1px;width:auto;height:auto;border:1px solid #ccc;border-top:0} .gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:5px;width:auto;height:25px;border-bottom:0;color:#e0e0e0;font-weight:normal;text-align:left;line-height:2.1em !important;line-height:1.8em} diff --git a/css/default.css b/css/default.css index 3182ca788..f77252fdd 100644 --- a/css/default.css +++ b/css/default.css @@ -56,25 +56,24 @@ a:active {color:#000;text-decoration:underline} /* gnb js off */ #gnb {background:#f0f4f8} #gnb h2 {margin:0;padding:0;width:0;height:0;overflow:hidden} -#gnb ul {z-index:10;margin:0 auto;padding:0;width:980px} +#gnb_ul {z-index:10;margin:0 auto;padding:0;width:980px} .gnb_1depth {position:relative;margin-left:-1px;zoom:1} .gnb_1depth:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_1depth a {display:inline-block;float:left;height:35px;color:#fff;line-height:2.7em !important;line-height:2.4em} +.gnb_1depth a {display:block;float:left;height:35px;color:#000;line-height:2.7em !important;line-height:2.4em} .gnb_1depth_air a, .gnb_1depth_on a {color:#000} .gnb_1depth a:focus, .gnb_1depth a:hover, .gnb_1depth a:active {text-decoration:none} .gnb_1depth ul {float:left;zoom:1} -.gnb_1depth ul:after {display:inline-block;visibility:hidden;clear:both;content:""} +.gnb_1depth ul:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1depth li {float:left} -.gnb_1depth_over ul {top:35px;left:-1px;width:auto;height:auto;border:1px solid #ccc;border-top:0} -.gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:5px;width:auto;height:25px;border-bottom:0;color:#fff;font-weight:normal;text-align:left;line-height:2.1em !important;line-height:1.8em} +.gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:0 5px;width:auto;height:35px;border-bottom:0;color:#000;font-weight:normal;text-align:left;line-height:2.7em !important;line-height:2.4em} /* gnb js on */ .gnb_js {border-bottom:1px solid #c3c7c5;background:#fff} .gnb_js ul {zoom:1} .gnb_js ul:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-2px} +.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-1px} .gnb_js .gnb_1depth a {display:inline-block;float:none;padding:0 15px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;text-align:center;letter-spacing:-0.1em;line-height:2.1em} .gnb_js .gnb_1depth_air a {float:none;background:#f7f7f2;color:#000} .gnb_js .gnb_1depth_on a {float:none;background:#fff;color:#000} @@ -84,7 +83,7 @@ a:active {color:#000;text-decoration:underline} .gnb_js .gnb_1depth ul {width:1px !important;height:0 !important;overflow:hidden} .gnb_js .gnb_1depth li {float:none} .gnb_js .gnb_1depth_over ul {position:absolute;top:35px;left:0;width:181px !important;height:auto !important;border:1px solid #c3c7c5;border-top:0} -.gnb_js .gnb_2depth a {display:inline-block;margin:0;padding:5px 10px;width:161px;height:25px;border:0;background:#fff;color:#000;font-weight:normal;text-align:left;line-height:2.1em} +.gnb_js .gnb_2depth a {display:inline-block;margin:0;padding:5px 10px;width:161px;height:25px;border:0;background:#fff;color:#000;font-weight:normal;text-align:left;line-height:2.1em !important} /* 중간 레이아웃 */ #wrapper {margin:50px auto;width:980px;zoom:1} From 8223c54483b79270898c39d46b57e39d5bed4a8b Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 25 Feb 2013 17:16:20 +0900 Subject: [PATCH 8/8] =?UTF-8?q?gnb=20=EC=88=98=EC=A0=95=EC=99=84=EB=A3=8C?= =?UTF-8?q?=20=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 1 - 1 file changed, 1 deletion(-) diff --git a/css/admin.css b/css/admin.css index fc9f05dbb..6e3bc3caa 100644 --- a/css/admin.css +++ b/css/admin.css @@ -61,7 +61,6 @@ h2 {font-size:1.2em} .gnb_1depth ul {float:left;zoom:1} .gnb_1depth ul:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1depth li {float:left} -.gnb_1depth_over ul {top:35px;left:-1px;width:auto;height:auto;border:1px solid #ccc;border-top:0} .gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:5px;width:auto;height:25px;border-bottom:0;color:#e0e0e0;font-weight:normal;text-align:left;line-height:2.1em !important;line-height:1.8em} /* gnb js on */ .gnb_js {}