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

g5 merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-10-04 15:34:55 +09:00
parent b41f43a08f 6b196d7b04
commit 81e65042f9
6 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
css/admin.css
View File

@ -10,7 +10,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
header ul, nav ul, aside ul, footer ul {margin:0;padding:0;list-style:none} header ul, nav ul, aside ul, footer ul {margin:0;padding:0;list-style:none}
label, input, select, img {vertical-align:middle} label, input, select, img {vertical-align:middle}
select {margin:0;font-size:1em} textarea, select {font-size:1em}
input {margin:0;padding:0;border-radius:0;font-family:dotum} input {margin:0;padding:0;border-radius:0;font-family:dotum}
input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none} input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none}
@ -517,12 +517,7 @@ td {padding:8px 5px;border:1px solid #e9e9e9;line-height:1.5em;word-break:break-
#point_mng {margin-top:50px} #point_mng {margin-top:50px}
/* 회원메일발송 목록 */ /* 회원메일발송 목록 */
.td_test, .td_send {width:50px;text-align:center} .td_test, .td_send {width:50px;text-align:center}
<<<<<<< HEAD
.td_mng {width:100px;text-align:center}
.td_smallmng {width:70px;text-align:center}
=======
>>>>>>> g5
/* 투표관리 목록 */ /* 투표관리 목록 */
.td_etc {width:80px;text-align:center} .td_etc {width:80px;text-align:center}
/* 게시판관리 목록 */ /* 게시판관리 목록 */

2
css/default.css
View File

@ -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} 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} header ul, nav ul, footer ul {margin:0;padding:0;list-style:none}
label, input, select, img {vertical-align:middle} label, input, select, img {vertical-align:middle}
textarea,
select {font-size:1em} select {font-size:1em}
input {margin:0;padding:0;border-radius:0;font-family:dotum} input {margin:0;padding:0;border-radius:0;font-family:dotum}
input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none} input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none}

4
css/mobile.css
View File

@ -11,8 +11,8 @@ header ul, nav ul, footer ul {margin:0;padding:0;list-style:none}
legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
label, input, select, img {vertical-align:middle} label, input, select, img {vertical-align:middle}
input,button {margin:0;padding:0} input,button {margin:0;padding:0}
input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0;font-size:1em} /* 모바일에서만 사용 */ input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0;font-size:1em}
select, textarea {font-size:1em} textarea, select {font-size:1em}
textarea {border-radius:0;-webkit-appearance:none} textarea {border-radius:0;-webkit-appearance:none}
p {margin:0;padding:1em 0;line-height:1.7em;word-break:break-all} p {margin:0;padding:1em 0;line-height:1.7em;word-break:break-all}
hr {display:none} hr {display:none}

1
install/index.php
View File

@ -1,6 +1,7 @@
<?php <?php
include_once ('../config.php'); include_once ('../config.php');
$title = G5_VERSION." 설치 3단계 중 1단계 라이센스 확인"; $title = G5_VERSION." 설치 3단계 중 1단계 라이센스 확인";
require_once('./library.check.php');
include_once ('./install.inc.php'); include_once ('./install.inc.php');
?> ?>

14
install/library.check.php Normal file
View File

@ -0,0 +1,14 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
function die_utf8($msg)
{
if(!trim($msg))
return;
die('<meta charset="utf-8"><p>'.$msg.'</p>');
}
if(!extension_loaded('gd') || !function_exists('gd_info'))
die('GD 라이브러리를 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.');
?>

1
plugin/okname/key/.htaccess Normal file
View File

@ -0,0 +1 @@
# .htaccess