From 8ef5dfb8f80de282b960385ddba8842d505c8ff5 Mon Sep 17 00:00:00 2001 From: nap0o <144927971+nap0o@users.noreply.github.com> Date: Mon, 8 Apr 2024 10:31:28 -0400 Subject: [PATCH] =?UTF-8?q?ServerStatus=E4=B8=BB=E9=A2=98=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=B8=96?= =?UTF-8?q?=E7=95=8C=E5=88=86=E5=B8=83=E5=9B=BE=E5=8A=9F=E8=83=BD=20(#344)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/l10n/en-US.toml | 3 + resource/l10n/es-ES.toml | 5 +- resource/l10n/zh-CN.toml | 3 + resource/l10n/zh-TW.toml | 3 + .../static/theme-server-status/css/dark.css | 13 ++ .../static/theme-server-status/css/light.css | 13 ++ .../static/theme-server-status/css/main.css | 44 +++++- .../theme-server-status/content-footer.html | 3 + .../template/theme-server-status/header.html | 9 +- .../template/theme-server-status/home.html | 140 +++++++++++++++++- 10 files changed, 228 insertions(+), 8 deletions(-) diff --git a/resource/l10n/en-US.toml b/resource/l10n/en-US.toml index 63f5d3ec0b..d1f6710213 100644 --- a/resource/l10n/en-US.toml +++ b/resource/l10n/en-US.toml @@ -639,3 +639,6 @@ other = "Asset" [DisableSwitchTemplateInFrontend] other = "Disable Switch Template in Frontend" + +[ServersOnWorldMap] +other = "Servers On World Map" diff --git a/resource/l10n/es-ES.toml b/resource/l10n/es-ES.toml index 1c727bb495..de7ead04b9 100644 --- a/resource/l10n/es-ES.toml +++ b/resource/l10n/es-ES.toml @@ -638,4 +638,7 @@ other = "Plantilla" other = "Stat" [DisableSwitchTemplateInFrontend] -other = "Deshabilitar Cambio de Plantilla en Frontend" \ No newline at end of file +other = "Deshabilitar Cambio de Plantilla en Frontend" + +[ServersOnWorldMap] +other = "Servidores en el mapa mundial" \ No newline at end of file diff --git a/resource/l10n/zh-CN.toml b/resource/l10n/zh-CN.toml index 212b2365ec..89ab1a9439 100644 --- a/resource/l10n/zh-CN.toml +++ b/resource/l10n/zh-CN.toml @@ -639,3 +639,6 @@ other = "信息" [DisableSwitchTemplateInFrontend] other = "禁止前台切换模板" + +[ServersOnWorldMap] +other = "服务器世界分布图" diff --git a/resource/l10n/zh-TW.toml b/resource/l10n/zh-TW.toml index 1aaaba40f5..7c94ed3a59 100644 --- a/resource/l10n/zh-TW.toml +++ b/resource/l10n/zh-TW.toml @@ -639,3 +639,6 @@ other = "信息" [DisableSwitchTemplateInFrontend] other = "禁止前台切換主題" + +[ServersOnWorldMap] +other = "伺服器世界分布圖" diff --git a/resource/static/theme-server-status/css/dark.css b/resource/static/theme-server-status/css/dark.css index 258d2563a5..7748a225bb 100644 --- a/resource/static/theme-server-status/css/dark.css +++ b/resource/static/theme-server-status/css/dark.css @@ -157,3 +157,16 @@ body[theme="dark"] footer p a:hover { color: #f1f1f1; text-decoration: none; } + +body[theme="dark"] .modal-content{ + background-color: #1c1d26; + color: #f1f1f1; +} + +body[theme="dark"] .modal-header{ + border-bottom-color:#080808; +} + +body[theme="dark"] .modal-header i{ + color: #f1f1f1; +} diff --git a/resource/static/theme-server-status/css/light.css b/resource/static/theme-server-status/css/light.css index 5c5e2286bd..41660cf6f7 100644 --- a/resource/static/theme-server-status/css/light.css +++ b/resource/static/theme-server-status/css/light.css @@ -131,4 +131,17 @@ body[theme="light"] footer p a, body[theme="light"] footer p a:hover { color: #333333; text-decoration: none; +} + +body[theme="light"] .modal-content{ + background-color: #ffffff; + color: rgba(0, 0, 0, 0.87); +} + +body[theme="light"] .modal-header{ + border-bottom-color:#f1f1f1; +} + +body[theme="light"] .modal-header i{ + color: rgba(0, 0, 0, 0.87); } \ No newline at end of file diff --git a/resource/static/theme-server-status/css/main.css b/resource/static/theme-server-status/css/main.css index cacb9a5453..e0f252ab5d 100644 --- a/resource/static/theme-server-status/css/main.css +++ b/resource/static/theme-server-status/css/main.css @@ -281,10 +281,42 @@ body { .service-status .tooltip-inner { max-width: 500px; } +/* 服务页 正文结束 */ +/* 服务器分布图 */ +#mapChartBox{ + z-index: 999999999; +} + +.modal-content{ + display: flex; + flex-direction: column; + pointer-events: auto; +} + +.modal-dialog-centered{ + margin: 0 auto; + width: 1134px; + max-width: 1134px; + display: flex; + align-items: center; /* 垂直居中 */ + justify-content: center; /* 水平居中 */ + min-height: calc(100%) /* 确保模态框占据整个视口高度 */ +} + +.modal-header{ + position: relative; +} + +.modal-header i{ + cursor: pointer; + position: absolute; + font-size: 2em; + top: 13px; + right: 13px; +} -/* 服务页 正文结束 */ @media only screen and (max-width: 1200px) { .accordian-body{ margin: 5px 0px 5px 10px; @@ -365,6 +397,16 @@ body { .toolbox { right: 18px; } + .modal-dialog-centered{ + width: 95%; + } + .modal-title{ + line-height: 0.5; + } + .modal-header i{ + top: 8px; + right: 8px; + } } @media only screen and (min-width: 768px) { diff --git a/resource/template/theme-server-status/content-footer.html b/resource/template/theme-server-status/content-footer.html index 1da9d34842..bb5ed72c36 100644 --- a/resource/template/theme-server-status/content-footer.html +++ b/resource/template/theme-server-status/content-footer.html @@ -5,6 +5,9 @@