diff --git a/resource/static/main.css b/resource/static/main.css index f2f81a9..9f09963 100644 --- a/resource/static/main.css +++ b/resource/static/main.css @@ -70,5 +70,10 @@ } .ui.progress .bar { - min-width: .15em !important; + min-width: 1.26em !important; + text-align: right; + padding-right: .4em; + line-height: 1.75em; + color: rgba(255, 255, 255, .7); + font-weight: 700; } \ No newline at end of file diff --git a/resource/static/theme-hotaru/css/main.css b/resource/static/theme-hotaru/css/main.css index 9ddfabf..973a837 100644 --- a/resource/static/theme-hotaru/css/main.css +++ b/resource/static/theme-hotaru/css/main.css @@ -190,5 +190,7 @@ table tr { } .ui.progress .bar { - min-width: .15em !important; + min-width: 1.26em !important; + text-align: right; + padding-right: 0.4em; } \ No newline at end of file diff --git a/resource/template/common/header.html b/resource/template/common/header.html index 630d5a2..bc65924 100644 --- a/resource/template/common/header.html +++ b/resource/template/common/header.html @@ -9,7 +9,7 @@ {{.Title}} - + diff --git a/resource/template/theme-default/home.html b/resource/template/theme-default/home.html index 639674a..77347b4 100644 --- a/resource/template/theme-default/home.html +++ b/resource/template/theme-default/home.html @@ -36,9 +36,7 @@
-
- @#formatPercent(server.live,server.State.CPU,100).percent#@% -
+ @#formatPercent(server.live,server.State.CPU,100).percent#@%
@@ -48,9 +46,7 @@ :class="formatPercent(server.live,server.State.MemUsed, server.Host.MemTotal).class">
-
- @#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0)#@% -
+ @#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0)#@%
@@ -60,9 +56,7 @@ :class="formatPercent(server.live,server.State.SwapUsed, server.Host.SwapTotal).class">
-
- @#parseInt(server.State?server.State.SwapUsed/server.Host.SwapTotal*100:0)#@% -
+ @#parseInt(server.State?server.State.SwapUsed/server.Host.SwapTotal*100:0)#@%
@@ -79,9 +73,7 @@ :class="formatPercent(server.live,server.State.DiskUsed, server.Host.DiskTotal).class">
-
- @#parseInt(server.State?server.State.DiskUsed/server.Host.DiskTotal*100:0)#@% -
+ @#parseInt(server.State?server.State.DiskUsed/server.Host.DiskTotal*100:0)#@%
diff --git a/resource/template/theme-hotaru/home.html b/resource/template/theme-hotaru/home.html index c473b8f..ded0313 100644 --- a/resource/template/theme-hotaru/home.html +++ b/resource/template/theme-hotaru/home.html @@ -17,7 +17,7 @@ - + {{if ts .CustomCode}} {{.CustomCode|safe}}