From 869a889301561f2cdce4057fd1e2c1ffa0769dac Mon Sep 17 00:00:00 2001 From: naiba Date: Fri, 5 Feb 2021 10:41:22 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20=E9=BB=98=E8=AE=A4=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E5=88=86=E7=BB=84gap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- resource/static/main.css | 98 +++++++++++++++------------- resource/template/common/header.html | 2 +- service/dao/dao.go | 2 +- 4 files changed, 54 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index a0e4fb2..fa1d391 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 哪吒面板 -![dashboard](https://img.shields.io/badge/管理面板-v0.4.6-brightgreen?style=for-the-badge&logo=github) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=%E9%9D%A2%E6%9D%BF%E6%9E%84%E5%BB%BA&logo=github&style=for-the-badge) ![Agent release](https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20%E6%9E%84%E5%BB%BA&logo=github&style=for-the-badge) ![shell](https://img.shields.io/badge/安装脚本-v0.4.4-brightgreen?style=for-the-badge&logo=linux) +![dashboard](https://img.shields.io/badge/管理面板-v0.4.7-brightgreen?style=for-the-badge&logo=github) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=%E9%9D%A2%E6%9D%BF%E6%9E%84%E5%BB%BA&logo=github&style=for-the-badge) ![Agent release](https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20%E6%9E%84%E5%BB%BA&logo=github&style=for-the-badge) ![shell](https://img.shields.io/badge/安装脚本-v0.4.4-brightgreen?style=for-the-badge&logo=linux) 系统状态监控报警、API(SSL 证书变更、即将到期、到期)/TCP 端口存活/PING 监控、计划任务(可以定时在 Agent 上执行命令，备份、重启、What ever you want)、极省资源，64M 服务器也能装 agent。 diff --git a/resource/static/main.css b/resource/static/main.css index daeb9ee..2c0aff9 100644 --- a/resource/static/main.css +++ b/resource/static/main.css @@ -1,101 +1,105 @@ @media only screen and (min-width: 1200px) { - .ui.container { - width: 77%; - } + .ui.container { + width: 77%; + } } .nb-container { - padding-top: 75px; - min-height: 100%; - padding-bottom: 55px; - margin-bottom: -47px; + padding-top: 75px; + min-height: 100%; + padding-bottom: 55px; + margin-bottom: -47px; +} + +#app .ui.fluid.accordion { + margin-bottom: 1rem; } .login.nb-container { - display: flex; - align-items: center; - padding-top: unset; + display: flex; + align-items: center; + padding-top: unset; } -.login.nb-container>.grid { - width: 100%; - margin: 0 auto; +.login.nb-container > .grid { + width: 100%; + margin: 0 auto; } -.login.nb-container>.grid .column { - max-width: 450px; +.login.nb-container > .grid .column { + max-width: 450px; } .status.cards .flag { - margin-right: 0 !important; + margin-right: 0 !important; } -.status.cards .header>.info.icon { - float: right; - margin-right: 0; +.status.cards .header > .info.icon { + float: right; + margin-right: 0; } .status.cards .wide.column { - padding-top: 0 !important; - padding-bottom: 0 !important; - height: 2rem !important; + padding-top: 0 !important; + padding-bottom: 0 !important; + height: 2rem !important; } .status.cards .three.wide.column { - padding-right: 0 !important; + padding-right: 0 !important; } .status.cards .wide.column:nth-child(1) { - margin-top: 1rem !important; + margin-top: 1rem !important; } .status.cards .wide.column:nth-child(2) { - margin-top: 1rem !important; + margin-top: 1rem !important; } .status.cards .description { - padding-bottom: 1rem !important; + padding-bottom: 1rem !important; } .status.cards .ui.content.popup { - min-width: 250px; + min-width: 250px; } .status.cards .outline.icon { - margin-right: 0 !important; + margin-right: 0 !important; } .ui.progress .bar { - min-width: 1.26em !important; - text-align: right; - padding-right: .4em; - line-height: 1.75em; - color: rgba(255, 255, 255, .7); - font-weight: 700; + min-width: 1.26em !important; + text-align: right; + padding-right: 0.4em; + line-height: 1.75em; + color: rgba(255, 255, 255, 0.7); + font-weight: 700; } .service-status .delay-today { - display: flex; - align-items: center; + display: flex; + align-items: center; } -.service-status .delay-today>i { - display: inline-block; - width: 1.2em; - height: 1.2em; - border-radius: .6em; - background-color: grey; - margin-right: .3em; +.service-status .delay-today > i { + display: inline-block; + width: 1.2em; + height: 1.2em; + border-radius: 0.6em; + background-color: grey; + margin-right: 0.3em; } .service-status .danger { - background-color: crimson !important; + background-color: crimson !important; } .service-status .good { - background-color: rgb(0, 235, 139) !important; + background-color: rgb(0, 235, 139) !important; } .service-status .warning { - background-color: orange !important; -} \ No newline at end of file + background-color: orange !important; +} diff --git a/resource/template/common/header.html b/resource/template/common/header.html index 1a3ea17..705b4ea 100644 --- a/resource/template/common/header.html +++ b/resource/template/common/header.html @@ -9,7 +9,7 @@ {{.Title}} - + diff --git a/service/dao/dao.go b/service/dao/dao.go index 36a8257..a8812a2 100644 --- a/service/dao/dao.go +++ b/service/dao/dao.go @@ -13,7 +13,7 @@ import ( pb "github.com/naiba/nezha/proto" ) -var Version = "v0.4.6" // ！！记得修改 README 重的 badge 版本！！ +var Version = "v0.4.7" // ！！记得修改 README 重的 badge 版本！！ const ( SnapshotDelay = 3