diff --git a/css/config.css b/css/config.css index 2c2a272f..56c5718c 100644 --- a/css/config.css +++ b/css/config.css @@ -2,7 +2,7 @@ body { color: white; background-color: black; - font-family: '맑은 고딕'; + font-family: 'Pretendard'; } table { @@ -17,7 +17,6 @@ table { font-size: 13px; word-break: break-all; text-align: center; - font-family: '맑은 고딕'; } th, @@ -33,7 +32,6 @@ td { font-size: 13px; word-break: break-all; text-align: center; - font-family: '맑은 고딕'; } a.just_link { @@ -73,8 +71,6 @@ a.just_link { font-size: 13px; word-break: break-all; text-align: center; - font-family: '맑은 고딕'; - ; } .obj_fill { @@ -87,7 +83,6 @@ button.with_skin { padding: 0 4px; background-color: black; color: white; - font-family: '맑은 고딕'; font-size: 13px; } @@ -98,7 +93,6 @@ button.with_skin:disabled { input.with_skin { background-color: black; color: white; - font-family: '맑은 고딕'; font-size: 13px; } diff --git a/css/install.css b/css/install.css index c98cfd6e..b0c840c8 100644 --- a/css/install.css +++ b/css/install.css @@ -7,10 +7,10 @@ body, html{ margin-top: 70px; } -h1.title { +h1.title { font-size: 50px; - font-family: 'Passion One', cursive; - font-weight: 400; + font-family: 'Pretendard', 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic'; + font-weight: 400; } hr{ diff --git a/css/join.css b/css/join.css index 76822f61..64edee35 100644 --- a/css/join.css +++ b/css/join.css @@ -7,10 +7,10 @@ margin-top: 70px; } -h1.title { +h1.title { font-size: 50px; - font-family: 'Passion One', cursive; - font-weight: 400; + font-family: 'Pretendard', 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic'; + font-weight: 400; } hr{ diff --git a/css/login.css b/css/login.css index c1aaf6d1..b9ce168f 100644 --- a/css/login.css +++ b/css/login.css @@ -10,7 +10,7 @@ html { h1.title { font-size: 50px; - font-family: 'Passion One', cursive; + font-family: 'Pretendard', 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic'; font-weight: 400; } diff --git a/f_install/install.php b/f_install/install.php index 9fc504b3..83902b44 100644 --- a/f_install/install.php +++ b/f_install/install.php @@ -16,6 +16,7 @@ require(__DIR__.'/../vendor/autoload.php'); +
diff --git a/hwe/_119.php b/hwe/_119.php index 1bec598d..8434faf3 100644 --- a/hwe/_119.php +++ b/hwe/_119.php @@ -25,6 +25,7 @@ $plock = $db->queryFirstField('SELECT plock FROM plock'); +
@@ -35,4 +36,3 @@ $plock = $db->queryFirstField('SELECT plock FROM plock');
- diff --git a/hwe/_admin1.php b/hwe/_admin1.php index 61831e53..872907e9 100644 --- a/hwe/_admin1.php +++ b/hwe/_admin1.php @@ -23,6 +23,7 @@ $admin = getAdmin(); + diff --git a/hwe/_admin2.php b/hwe/_admin2.php index 1ca1dfc8..1c44c55b 100644 --- a/hwe/_admin2.php +++ b/hwe/_admin2.php @@ -24,6 +24,7 @@ $db = DB::db(); + diff --git a/hwe/_admin4.php b/hwe/_admin4.php index d175b058..99930aee 100644 --- a/hwe/_admin4.php +++ b/hwe/_admin4.php @@ -41,6 +41,7 @@ function colorBlockedName($general){ + @@ -106,7 +107,7 @@ function colorBlockedName($general){ - + $users): ?> diff --git a/hwe/_admin5.php b/hwe/_admin5.php index 689c6c4f..e64ff4c4 100644 --- a/hwe/_admin5.php +++ b/hwe/_admin5.php @@ -40,6 +40,7 @@ $sel2[$type2] = "selected"; + diff --git a/hwe/_admin7.php b/hwe/_admin7.php index 56e5528d..963e4239 100644 --- a/hwe/_admin7.php +++ b/hwe/_admin7.php @@ -87,6 +87,7 @@ $generalObj = General::createGeneralObjFromDB($gen); + diff --git a/hwe/_admin8.php b/hwe/_admin8.php index a8c6bf7d..4b64f458 100644 --- a/hwe/_admin8.php +++ b/hwe/_admin8.php @@ -32,6 +32,7 @@ $sel[$type] = "selected"; +
최근로그인 IP ID
',array_map('\sammo\colorBlockedName', $users))?>
diff --git a/hwe/a_bestGeneral.php b/hwe/a_bestGeneral.php index 757a152f..626ff9a0 100644 --- a/hwe/a_bestGeneral.php +++ b/hwe/a_bestGeneral.php @@ -28,6 +28,7 @@ $templates = new \League\Plates\Engine(__DIR__.'/templates'); + diff --git a/hwe/a_emperior.php b/hwe/a_emperior.php index 5631330e..8247a824 100644 --- a/hwe/a_emperior.php +++ b/hwe/a_emperior.php @@ -22,6 +22,7 @@ increaseRefresh("왕조일람", 1); + diff --git a/hwe/a_emperior_detail.php b/hwe/a_emperior_detail.php index bd988a68..5bb18292 100644 --- a/hwe/a_emperior_detail.php +++ b/hwe/a_emperior_detail.php @@ -29,6 +29,7 @@ $serverID = $emperior['server_id']??($emperior['serverID']??null); + diff --git a/hwe/a_genList.php b/hwe/a_genList.php index 6b60b1e2..de37dcc8 100644 --- a/hwe/a_genList.php +++ b/hwe/a_genList.php @@ -46,6 +46,7 @@ if($gameStor->isunited){ + diff --git a/hwe/a_hallOfFame.php b/hwe/a_hallOfFame.php index 5f66fea6..01ee2402 100644 --- a/hwe/a_hallOfFame.php +++ b/hwe/a_hallOfFame.php @@ -49,6 +49,7 @@ else{ + diff --git a/hwe/a_history.php b/hwe/a_history.php index 199713d0..dba2e153 100644 --- a/hwe/a_history.php +++ b/hwe/a_history.php @@ -106,6 +106,7 @@ $nations = Json::decode($history['nations']); + + @@ -149,8 +150,6 @@ if (!$otherTextInfo) { 'baseColor2' => GameConst::$basecolor2, ]) ?> - - diff --git a/hwe/recent_map.php b/hwe/recent_map.php index 0c5d8663..bafb8adf 100644 --- a/hwe/recent_map.php +++ b/hwe/recent_map.php @@ -26,6 +26,7 @@ include "func.php"; +