firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'g4s'

Browse Source
This commit is contained in:
chicpro
2013-08-02 15:03:31 +09:00
parent e7bf127df1 ed9f108eca
commit 4abea0c932
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
css/default.css
View File

@ -60,7 +60,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
.gnb_js .gnb_1dli_on a {float:none;background:#333;color:#fff}
.gnb_js .gnb_2dul {display:none;position:absolute;top:35px}
.gnb_js .gnb_2da {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left}
.gnb_1dli_over .gnb_2dul {display:block;left:0;background:#fff}
.gnb_1dli_over .gnb_2dul {display:block;left:0;width:180px;background:#fff}
.gnb_1dli_over2 .gnb_2dul {display:block;right:1px;width:180px;background:#fff}
.gnb_empty {width:100%;height:35px;text-align:center;line-height:2.95em}

4
head.sub.php
View File

@ -48,8 +48,8 @@ if (defined('G4_IS_ADMIN')) {
if (defined('_SHOP_')) $shop_css = '_shop';
echo '<link rel="stylesheet" href="'.G4_CSS_URL.'/'.(G4_IS_MOBILE?'mobile':'default').$shop_css.'.css">'.PHP_EOL;
}
// echo '<meta http-equiv="imagetoolbar" content="no">';
// echo '<meta http-equiv="X-UA-Compatible" content="IE=Edge" />';
echo '<meta http-equiv="imagetoolbar" content="no">';
echo '<meta http-equiv="X-UA-Compatible" content="IE=Edge">';
?>
<!--[if lte IE 8]>
<script src="<?php echo G4_JS_URL ?>/html5.js"></script>