diff --git a/.gitignore b/.gitignore index dbea94015..8499b98bc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,25 +2,15 @@ dbconfig.php log .htaccess data -/.htaccess data/ test +.htaccess config.php +data/ +test/ sirgle -sr_* -google* -skin/latest/basic2 -rankiss* -thumb.lib.php test.php -itzimara* -nemoluv* -cheditor* *.key g5_tree *.sh -kcho07_rss/ -mobile/skin/board/bach72_mobile/ -skin/board -lessc.inc.php -lessc.php \ No newline at end of file +cheditor5/ diff --git a/css/admin.css b/css/admin.css index 35c710b6e..ad729c4d1 100644 --- a/css/admin.css +++ b/css/admin.css @@ -49,25 +49,24 @@ h3 {margin:0 20px} /* gnb js off */ #gnb {z-index:12;min-width:999px;background:#383a3f} #gnb h2 {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden} -#gnb_1dul {margin:0 auto;padding:0;zoom:1} +#gnb_1dul {margin:0 20px;padding:0;zoom:1} #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1dli {z-index:13;clear:both;zoom:1} .gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_1dli a {display:block;float:left;padding:10px 0;width:110px;color:#e0e0e0;font-weight:bold;text-decoration:none} +.gnb_1dli a {display:block;float:left;width:110px;height:34px;color:#fff;font-weight:bold;text-decoration:none;line-height:2.8em} .gnb_1dli a:focus, .gnb_1dli a:hover {text-decoration:none} .gnb_2dul {float:left;width:auto} .gnb_2dli {float:left} .gnb_2dli a {color:#e0e0e0;font-weight:normal} /* gnb js on */ -.gnb_js {padding-left:1px} -.gnb_js #gnb_1dul {margin:0 20px;zoom:1} -.gnb_js #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} +.gnb_js {} +.gnb_js #gnb_1dul {zoom:1} .gnb_js .gnb_1dli {clear:none;position:relative;float:left;margin:0 0 0 -1px;border:1px solid #333;border-top:0;border-bottom:0} -.gnb_js .gnb_1dli a {color:#fff;text-align:center} +.gnb_js .gnb_1dli a {text-align:center} .gnb_js .gnb_1dli_air a {float:none;background:#fff;color:#000} .gnb_js .gnb_1dli_on a {float:none;background:#282828;color:#fff} .gnb_js .gnb_2dul {display:none;position:absolute;top:34px;width:181px;border:1px solid #999;border-top:0;background:#fff} -.gnb_js .gnb_2dli a {display:inline-block;float:none;padding:8px 10px;width:161px;background:#fff;color:#000;text-align:left} +.gnb_js .gnb_2dli a {display:inline-block;float:none;padding:8px 10px;width:161px;height:auto;background:#fff;color:#000;text-align:left;line-height:1em} .gnb_js .gnb_2dli a:focus, .gnb_js .gnb_2dli a:hover {background:#484848;color:#fff} .gnb_1dli_over .gnb_2dul {display:block;left:-1px} .gnb_1dli_over2 .gnb_2dul {display:block;right:-1px}