diff --git a/README.md b/README.md index f0e1044..458fdc2 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # 哪吒面板 -![哪吒面板](https://s3.ax1x.com/2020/12/08/DzHv6A.jpg) - 服务期状态监控,被动接收,极省资源 128M 小鸡也能装 Agent(非 node-exporter 那种主动拉取的方式。) -![首页截图](https://s3.ax1x.com/2020/12/07/DvTCwD.jpg) +| 哪吒面板 | 首页截图1 | 首页截图2 | +| ---- | ---- | ---- | +| ![哪吒面板](https://s3.ax1x.com/2020/12/08/DzHv6A.jpg) | ![首页截图1](https://s3.ax1x.com/2020/12/07/DvTCwD.jpg) | ![首页截图2](https://s3.ax1x.com/2020/12/09/rPF4xJ.png) | ## 一键脚本 diff --git a/resource/static/theme-hotaru/css/main.css b/resource/static/theme-hotaru/css/main.css index 4fc87af..9742d7c 100644 --- a/resource/static/theme-hotaru/css/main.css +++ b/resource/static/theme-hotaru/css/main.css @@ -143,13 +143,6 @@ h1 { } @media only screen and (max-width: 992px) { - - #location, - tr td:nth-child(4) { - display: none; - visibility: hidden; - } - .hotaru-cover { background: url(../img/tenshi_l.png) center no-repeat; background-size: 100%; @@ -157,25 +150,6 @@ h1 { } @media only screen and (max-width: 720px) { - - #type, - tr td:nth-child(3) { - display: none; - visibility: hidden; - } - - #location, - tr td:nth-child(4) { - display: none; - visibility: hidden; - } - - #uptime, - tr td:nth-child(5) { - display: none; - visibility: hidden; - } - .hotaru-cover { background: url(../img/tenshi.png) no-repeat; background-size: 100%; @@ -183,31 +157,6 @@ h1 { } @media only screen and (max-width: 600px) { - - #type, - tr td:nth-child(3) { - display: none; - visibility: hidden; - } - - #location, - tr td:nth-child(4) { - display: none; - visibility: hidden; - } - - #uptime, - tr td:nth-child(5) { - display: none; - visibility: hidden; - } - - #load, - tr td:nth-child(6) { - display: none; - visibility: hidden; - } - .hotaru-cover { background: url(../img/tenshi.png) no-repeat; background-size: 100%; @@ -215,37 +164,6 @@ h1 { } @media only screen and (max-width: 533px) { - - #type, - tr td:nth-child(3) { - display: none; - visibility: hidden; - } - - #location, - tr td:nth-child(4) { - display: none; - visibility: hidden; - } - - #uptime, - tr td:nth-child(5) { - display: none; - visibility: hidden; - } - - #traffic, - tr td:nth-child(8) { - display: none; - visibility: hidden; - } - - #load, - tr td:nth-child(6) { - display: none; - visibility: hidden; - } - .hotaru-cover { background: url(../img/tenshi.png) no-repeat; background-size: 100%; @@ -260,53 +178,9 @@ h1 { padding: 0; } - #name, - tr td:nth-child(2) { - min-width: 20px; - max-width: 60px; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - } - - #type, - tr td:nth-child(3) { - display: none; - visibility: hidden; - } - - #location, - tr td:nth-child(4) { - display: none; - visibility: hidden; - } - - #uptime, - tr td:nth-child(5) { - display: none; - visibility: hidden; - } - - #traffic, - tr td:nth-child(8) { - display: none; - visibility: hidden; - } - - #hdd, - tr td:nth-child(11) { - display: none; - visibility: hidden; - } - - #cpu, - #ram { - min-width: 20px; - max-width: 40px; - } - .hotaru-cover { background: url(../img/tenshi.png) no-repeat; background-size: 100%; } - } \ No newline at end of file + } +} \ No newline at end of file diff --git a/resource/template/theme-hotaru/home.html b/resource/template/theme-hotaru/home.html index 2cb8562..5e388e5 100644 --- a/resource/template/theme-hotaru/home.html +++ b/resource/template/theme-hotaru/home.html @@ -16,9 +16,9 @@ - - - + + + @@ -80,17 +80,17 @@
-
- @#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal:0)#@% + @#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0)#@%
-
- @#parseInt(server.State?server.State.DiskUsed/server.Host.DiskTotal:0)#@% + @#parseInt(server.State?server.State.DiskUsed/server.Host.DiskTotal*100:0)#@%