diff --git a/adm/admin.head.php b/adm/admin.head.php index b1c3b5f91..59e6961d3 100644 --- a/adm/admin.head.php +++ b/adm/admin.head.php @@ -116,8 +116,9 @@ function imageview(id, w, h)
- - - + + + +

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} diff --git a/head.php b/head.php index 39cd0d928..0110ee254 100644 --- a/head.php +++ b/head.php @@ -178,7 +178,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']) {