+
+
diff --git a/AvocadoAmber/adm/admin.tail.php b/AvocadoAmber/adm/admin.tail.php
index b39a053..b5d291b 100644
--- a/AvocadoAmber/adm/admin.tail.php
+++ b/AvocadoAmber/adm/admin.tail.php
@@ -2,6 +2,7 @@
if (!defined('_GNUBOARD_'))
exit;
?>
+
@@ -11,6 +12,17 @@ if (!defined('_GNUBOARD_'))
-
+
설치된 테마
diff --git a/AvocadoAmber/common.php b/AvocadoAmber/common.php
index 2de4b81..a9d8c14 100644
--- a/AvocadoAmber/common.php
+++ b/AvocadoAmber/common.php
@@ -6,7 +6,7 @@
/*******************************************************************************
** 공통 변수, 상수, 코드
*******************************************************************************/
-error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_PARSE | E_USER_ERROR);
+error_reporting(E_CORE_ERROR | E_COMPILE_ERROR | E_ERROR | E_PARSE | E_USER_ERROR);
// 보안설정이나 프레임이 달라도 쿠키가 통하도록 설정
header('P3P: CP="ALL CURa ADMa DEVa TAIa OUR BUS IND PHY ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE LOC OTC"');
@@ -422,7 +422,7 @@ if (file_exists($dbconfig_file)) {
아보카도 에디션을 먼저 설치해주십시오.
@@ -464,7 +464,7 @@ if (!defined('G5_IS_ADMIN')) {
아보카도 에디션 설정을 완료해주십시오.
diff --git a/AvocadoAmber/css/fonts/SCDream1.otf b/AvocadoAmber/css/fonts/SCDream1.otf
new file mode 100644
index 0000000..c8eac97
Binary files /dev/null and b/AvocadoAmber/css/fonts/SCDream1.otf differ
diff --git a/AvocadoAmber/css/fonts/SCDream2.otf b/AvocadoAmber/css/fonts/SCDream2.otf
new file mode 100644
index 0000000..c5625d9
Binary files /dev/null and b/AvocadoAmber/css/fonts/SCDream2.otf differ
diff --git a/AvocadoAmber/css/fonts/SCDream3.otf b/AvocadoAmber/css/fonts/SCDream3.otf
new file mode 100644
index 0000000..28a160c
Binary files /dev/null and b/AvocadoAmber/css/fonts/SCDream3.otf differ
diff --git a/AvocadoAmber/css/fonts/SCDream4.otf b/AvocadoAmber/css/fonts/SCDream4.otf
new file mode 100644
index 0000000..1978ea4
Binary files /dev/null and b/AvocadoAmber/css/fonts/SCDream4.otf differ
diff --git a/AvocadoAmber/css/fonts/SCDream5.otf b/AvocadoAmber/css/fonts/SCDream5.otf
new file mode 100644
index 0000000..628e828
Binary files /dev/null and b/AvocadoAmber/css/fonts/SCDream5.otf differ
diff --git a/AvocadoAmber/css/fonts/SCDream6.otf b/AvocadoAmber/css/fonts/SCDream6.otf
new file mode 100644
index 0000000..4e20297
Binary files /dev/null and b/AvocadoAmber/css/fonts/SCDream6.otf differ
diff --git a/AvocadoAmber/css/fonts/SCDream7.otf b/AvocadoAmber/css/fonts/SCDream7.otf
new file mode 100644
index 0000000..7e38170
Binary files /dev/null and b/AvocadoAmber/css/fonts/SCDream7.otf differ
diff --git a/AvocadoAmber/css/fonts/SCDream8.otf b/AvocadoAmber/css/fonts/SCDream8.otf
new file mode 100644
index 0000000..5d7e4be
Binary files /dev/null and b/AvocadoAmber/css/fonts/SCDream8.otf differ
diff --git a/AvocadoAmber/css/fonts/SCDream9.otf b/AvocadoAmber/css/fonts/SCDream9.otf
new file mode 100644
index 0000000..f6db18f
Binary files /dev/null and b/AvocadoAmber/css/fonts/SCDream9.otf differ
diff --git a/AvocadoAmber/css/scdream.css b/AvocadoAmber/css/scdream.css
new file mode 100644
index 0000000..8eb38d4
--- /dev/null
+++ b/AvocadoAmber/css/scdream.css
@@ -0,0 +1,55 @@
+@charset "utf-8";
+
+@font-face {
+ font-family: 'SCDream';
+ font-weight: 900;
+ src: url(./fonts/SCDream9.otf);
+}
+
+@font-face {
+ font-family: 'SCDream';
+ font-weight: 800;
+ src: url(./fonts/SCDream8.otf);
+}
+
+@font-face {
+ font-family: 'SCDream';
+ font-weight: 700;
+ src: url(./fonts/SCDream7.otf);
+}
+
+@font-face {
+ font-family: 'SCDream';
+ font-weight: 600;
+ src: url(./fonts/SCDream6.otf);
+}
+
+@font-face {
+ font-family: 'SCDream';
+ font-weight: 500;
+ src: url(./fonts/SCDream5.otf);
+}
+
+@font-face {
+ font-family: 'SCDream';
+ font-weight: 400;
+ src: url(./fonts/SCDream4.otf);
+}
+
+@font-face {
+ font-family: 'SCDream';
+ font-weight: 300;
+ src: url(./fonts/SCDream3.otf);
+}
+
+@font-face {
+ font-family: 'SCDream';
+ font-weight: 200;
+ src: url(./fonts/SCDream2.otf);
+}
+
+@font-face {
+ font-family: 'SCDream';
+ font-weight: 100;
+ src: url(./fonts/SCDream1.otf);
+}
diff --git a/AvocadoAmber/head.sub.php b/AvocadoAmber/head.sub.php
index 08e6120..64dc5e8 100644
--- a/AvocadoAmber/head.sub.php
+++ b/AvocadoAmber/head.sub.php
@@ -87,9 +87,10 @@ $html_class .= $_COOKIE['header_close'] == 'close' ? " close-header" : "";
include_once __DIR__ . "/_extra_font.php";
if (defined('G5_IS_ADMIN')) {
- echo get_embed_file("css", G5_ADMIN_PATH . '/css/admin.css') . PHP_EOL;
- echo get_embed_file("css", G5_ADMIN_PATH . '/css/admin.layout.css') . PHP_EOL;
- echo get_embed_file("css", G5_ADMIN_PATH . '/css/admin.amber.lib.css') . PHP_EOL;
+ // echo get_embed_file("css", G5_ADMIN_PATH . '/css/admin.css') . PHP_EOL;
+ // echo get_embed_file("css", G5_ADMIN_PATH . '/css/admin.layout.css') . PHP_EOL;
+ // echo get_embed_file("css", G5_ADMIN_PATH . '/css/admin.amber.lib.css') . PHP_EOL;
+ echo get_embed_file("css", G5_ADMIN_PATH . '/css/default.css') . PHP_EOL;
echo get_embed_file("css", G5_ADMIN_PATH . '/css/amberstone.cp.css') . PHP_EOL;
} else {
if (defined('G5_THEME_PATH') && file_exists(G5_THEME_PATH . "/css/default.css")) {
diff --git a/AvocadoAmber/install/install.inc.php b/AvocadoAmber/install/install.inc.php
index 5c2d7c8..c8df026 100644
--- a/AvocadoAmber/install/install.inc.php
+++ b/AvocadoAmber/install/install.inc.php
@@ -17,7 +17,9 @@ if (!$title)
-
+
@@ -403,6 +396,8 @@ EOD;
sql_query(" set time_zone = '" . G5_TIMEZONE . "'");
}
+ $g5['css_table'] = $table_prefix . 'css_config';
+
ob_start();
include "../adm/design_form_css.php";
$css = ob_get_contents();
diff --git a/AvocadoAmber/install/install_header.php b/AvocadoAmber/install/install_header.php
index e92fd41..ac57878 100644
--- a/AvocadoAmber/install/install_header.php
+++ b/AvocadoAmber/install/install_header.php
@@ -1,5 +1,2 @@
AVOCADO EDITION: AMBER
+?>AVOCADO EDITION: AMBER
diff --git a/AvocadoAmber/skin/member/basic/style.admin.css b/AvocadoAmber/skin/member/basic/style.admin.css
index f9c1557..5e8ed41 100644
--- a/AvocadoAmber/skin/member/basic/style.admin.css
+++ b/AvocadoAmber/skin/member/basic/style.admin.css
@@ -33,7 +33,7 @@ body {
right: 0;
height: 50%;
box-sizing: border-box;
- border-top: 8px solid #ecc6c6;
+ border-top: 8px solid #ffbf00;
background: url('./img/bak_admin_login_top_pattern.png');
z-index: 0;
}
@@ -84,7 +84,7 @@ body {
#login_title em {
font-style: normal;
- color: #ecc6c6;
+ color: #ffbf00;
text-align: center;
line-height: 1.5em;
}
@@ -119,7 +119,7 @@ body {
width: 500px;
height: 260px;
- border-top: 5px solid #ecc6c6;
+ border-top: 5px solid #ffbf00;
transform: translateX(-50%) translateY(-50%);
background: #fff;
@@ -173,7 +173,7 @@ body {
}
#mb_login fieldset.input input:focus {
- border: 2px solid #ecc6c6;
+ border: 2px solid #ffbf00;
}
#mb_login fieldset.input label {
@@ -204,7 +204,7 @@ body {
}
#mb_login fieldset.input input:focus+label:before {
- color: #ecc6c6;
+ color: #ffbf00;
}
#mb_login fieldset.input label.login_id:before {
@@ -249,7 +249,7 @@ body {
display: block;
width: 100%;
height: 100%;
- background: #ecc6c6;
+ background: #ffbf00;
font-family: 'Noto Sans KR', sans-serif;
font-size: 18px;
border: none;