g5 merge 충돌수정

2013-10-02 09:13:33 +09:00
parent 21c09985d7 0a1259b3a5
commit 5e05a31146
44 changed files with 811 additions and 551 deletions
--- a/head.sub.php
+++ b/head.sub.php
@ -87,7 +87,7 @@ if ($is_admin) {
 <script src="<?php echo G5_JS_URL ?>/wrest.js"></script>
 <?php
 if(G5_IS_MOBILE) {
-    echo '<script> set_cookie("device_width", screen.width, 6, g5_cookie_domain); </script>'.PHP_EOL;
+    echo '<script> set_cookie("device_width", $(window).width(), 6, g5_cookie_domain); </script>'.PHP_EOL;
    echo '<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>'.PHP_EOL; // overflow scroll 감지
 }
 //if(!defined('G5_IS_ADMIN'))