From da73358a6614d64e951505561ad23f6e51ecd23e Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 23 Sep 2013 17:28:33 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=ED=8F=B0=ED=8A=B8=20=EB=A6=AC=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=EC=A6=88=EB=A5=BC=20class=EB=A5=BC=20=EC=9D=B4?= =?UTF-8?q?=EC=9A=A9=ED=95=9C=20=EB=B0=A9=EB=B2=95=EC=9C=BC=EB=A1=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 --- adm/admin.head.php | 7 ++-- head.php | 7 ++-- js/common.js | 91 +++------------------------------------------- tail.php | 5 +-- 4 files changed, 14 insertions(+), 96 deletions(-) diff --git a/adm/admin.head.php b/adm/admin.head.php index 451ff77c0..79a5fe2b7 100644 --- a/adm/admin.head.php +++ b/adm/admin.head.php @@ -119,8 +119,9 @@ function imageview(id, w, h)
- - - + + + +

diff --git a/head.php b/head.php index fcdf0a912..54e2e2735 100644 --- a/head.php +++ b/head.php @@ -168,7 +168,8 @@ if ($config['cf_include_head']) {
- - - + + + +
\ No newline at end of file diff --git a/js/common.js b/js/common.js index fc4e51f24..375bddbc2 100644 --- a/js/common.js +++ b/js/common.js @@ -393,97 +393,16 @@ $(function() { /** * 텍스트 리사이즈 **/ -var default_font_size_saved = false; -var default_line_height_saved = false; -function font_resize(id, act) +function font_resize(id, rmv_class, add_class) { - var $elements = $("#"+id+" *").not("select").not("option"); - $elements.removeClass("applied"); + var $el = $("#"+id); - // 폰트 크기 변경에 따른 line-height 적용 - var lh = 1.5; - if(act == "default") - lh = "" + $el.removeClass(rmv_class).addClass(add_class); - $("#"+id+" *").css("line-height", lh); - - // 엘리먼트의 기본 폰트사이즈 저장 - if(!default_font_size_saved) { - save_default_font_size($elements); - } - - $elements.each(function() { - if($(this).hasClass("no_text_resize")) - return true; - - if($(this).data("fs")) { - set_font_size($(this), act) - } - }); - - set_cookie("ck_font_resize_act", act, 1, g5_cookie_domain); + set_cookie("ck_font_resize_rmv_class", rmv_class, 1, g5_cookie_domain); + set_cookie("ck_font_resize_add_class", add_class, 1, g5_cookie_domain); } - -/** - * font size 적용 -**/ -function set_font_size($el, act) -{ - if($el.hasClass("applied")) - return true; - - var x = 0; - var fs = $el.data("fs"); - var unit = fs.replace(/[0-9\.]/g, ""); - var fsize = parseFloat(fs.replace(/[^0-9\.]/g, "")); - var nfsize; - - if(!fsize) - return true; - - if(unit == "em") - x = 1; - - switch(act) { - case "large": - nfsize = fsize * 1.5; - break; - case "larger": - nfsize = fsize * 2; - break; - default: - nfsize = fsize; - lh = 1; - break; - } - - nfsize = nfsize.toFixed(x); - - $el.css("font-size", nfsize+unit).addClass("applied"); -} - - -/** - * 기본 font size .data()에 저장 -**/ -function save_default_font_size($el) -{ - $el.each(function() { - // 텍스트노드 있는지 체크 - var text = $(this).contents().filter(function() { - return this.nodeType == 3; - }).text().replace(/\s*/, ""); - - if(text.length) { - $(this).data("fs", $(this).css("font-size")); - } - }); - - default_font_size_saved = true; -} - - $(function(){ $(".win_point").click(function() { win_point(this.href); diff --git a/tail.php b/tail.php index a5139b2c8..d31191f07 100644 --- a/tail.php +++ b/tail.php @@ -68,10 +68,7 @@ if ($config['cf_analytics']) { From b88c274e720f1ab3505bde5aae407233ef77fdae Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 23 Sep 2013 17:29:54 +0900 Subject: [PATCH 2/3] =?UTF-8?q?input=20=ED=95=84=EB=93=9C=EC=9D=98=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=ED=8F=B0=ED=8A=B8=20=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=EC=A6=88=20=EC=B6=94=EA=B0=80?= 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 7ea3df1db..ca5f23c8d 100644 --- a/css/default.css +++ b/css/default.css @@ -9,7 +9,7 @@ h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum} article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block} header ul, nav ul, footer ul {margin:0;padding:0;list-style:none} label, input, select, img {vertical-align:middle} -input {margin:0;padding:0;border-radius:0;font-family:dotum} +input {margin:0;padding:0;border-radius:0;font-size:1em;font-family:dotum} button {border-radius:0;font-size:1em} p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all} hr {display:none} From c987dc857efd84eb7c4ac89f0920b23996a6dbb9 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 24 Sep 2013 13:57:09 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=84=A4=EC=B9=98=EC=8B=9C=20data/tmp=20?= =?UTF-8?q?=EB=94=94=EB=A0=89=ED=86=A0=EB=A6=AC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install_db.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/install_db.php b/install/install_db.php index f355f91fd..c4bd48d54 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -161,7 +161,8 @@ $dir_arr = array ( $data_path.'/file', $data_path.'/log', $data_path.'/member', - $data_path.'/session' + $data_path.'/session', + $data_path.'/tmp' ); for ($i=0; $i